Merge branch 'master' into lars-chat

This commit is contained in:
Lars van Hijfte
2017-01-13 11:11:44 +01:00
8 changed files with 92 additions and 162 deletions

View File

@@ -2,7 +2,6 @@
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" type="text/css" href="astyle.css">
<title>Admin Panel</title>
<script type="text/javascript">
function checkAll(allbox) {
@@ -18,10 +17,13 @@
</head>
<body>
<div class="content">
<div class="admin-panel">
<form action="index.html" method="post">
<div class="platform admin-panel">
<div class="admin-title">
<h1>User Management Panel</h1>
</div> <br>
<form action="admin.php" method="post">
<div class="admin-options">
<form action="index.html" method="post">
<form action="admin.php" method="post">
<div class="admin-searchbar">
<h2>Search</h2>
<input type="text" name="search" class="admin-searchinput"> <br>
@@ -35,7 +37,7 @@
</div>
</form>
<div class="admin-actions">
<h2>Actions: </h2>
<h2>Batch Actions: </h2>
<input type="radio" name="actions" value="mute"> Mute <br>
<input type="radio" name="actions" value="ban"> Ban <br>
<input type="radio" name="actions" value="unban"> Unban <br> <br>
@@ -87,7 +89,6 @@
</form>
</td>
</tr>
</table>
</div>
</form>

View File

@@ -2,7 +2,7 @@
<div class="profile-box platform">
<img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg">
<div class="profile-button">
<p><img src="../website/img/add-friend.png"> Als vriend toevoegen</p>
<p><img src="../img/add-friend.png"> Als vriend toevoegen</p>
</div>
<h1 class="profile-username">[gebruikersnaam]</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>

View File

@@ -36,7 +36,6 @@
<label for="bio">Bio</label>
<textarea name="bio"
rows="5"
cols="10"
title="bio"
id="bio"
></textarea>
@@ -48,22 +47,25 @@
>
</form>
<form class="settings-password platform" method="post">
<h5>Verander Wachtwoord</h5>
<br />
<label>Oud Wachtwoord</label>
<input type="password"
name="password-old"
placeholder="Oud wachtwoord"
><br />
<label>Nieuw wachtword</label>
<input type="password"
name="password-new"
placeholder="Nieuw wachtwoord"
><br />
<label>Bevestig wachtwoord</label>
<input type="password"
name="password-confirm"
placeholder="Bevestig wachtwoord"
><br />
<label></label>
<input type="submit"
value="Verander wachtwoord"
>
@@ -72,14 +74,19 @@
<form class="settings-email platform" method="post">
<h5>Verander Email</h5>
<br />
<label for="email">Nieuw Email</label>
<input type="email"
name="email"
placeholder="Nieuw Email-adres"
id="email"
placeholder="Nieuw Email"
><br />
<label for="email-confirm">Bevestig Email</label>
<input type="email"
name="email-confirm"
id="email-confirm"
placeholder="Bevestig Email"
><br />
<label></label>
<input type="submit"
value="Verander Email"
>