From 72d3a5ad8a735687deab004a08633cff65537780 Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Thu, 12 Jan 2017 11:16:57 +0100
Subject: [PATCH 1/3] added adminpanel main layout/concept

---
 website/admin.php             | 21 +++++++++
 website/styles/adminpanel.css | 64 ++++++++++++++++++++++++++++
 website/views/adminpanel.php  | 80 +++++++++++++++++++++++++++++++++++
 website/views/head.php        |  2 +-
 4 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 website/admin.php
 create mode 100644 website/styles/adminpanel.css
 create mode 100644 website/views/adminpanel.php
diff --git a/website/admin.php b/website/admin.php
new file mode 100644
index 0000000..8d8f8b5
--- /dev/null
+++ b/website/admin.php
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+    <?php
+        include("views/head.php");
+     ?>
+    <body>
+        <?php
+            /*
+             * This view adds the main layout over the screen.
+             * Header and menu.
+             */
+            include("views/main.php");
+
+            /* Add your view files here. */
+            include("views/adminpanel.php");
+
+            /* This adds the footer. */
+            include("views/footer.php");
+         ?>
+    </body>
+</html>
diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css
new file mode 100644
index 0000000..0bd8f1c
--- /dev/null
+++ b/website/styles/adminpanel.css
@@ -0,0 +1,64 @@
+.admin-panel {
+    margin: auto;
+    background-color: white;
+    border-radius: 10px;
+    padding: 15px;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+}
+
+.admin-options {
+}
+
+.admin-searchbar {
+    display: inline-block;
+    margin: 10px;
+    vertical-align: top;
+}
+
+.admin-searchinput {
+    border: 2px solid #B78996;
+    border-radius: 2px;
+    margin-bottom: 10px;
+}
+
+.admin-filter {
+    display: inline-block;
+    margin: 10px;
+    vertical-align: top;
+    margin-right: 100px;
+}
+
+.admin-actions {
+    display: inline-block;
+    margin: 10px;
+    vertical-align: top;
+}
+
+.admin-users {
+    margin: 10px;
+}
+
+.usertable {
+    width: 100%;
+}
+
+.usertable .table-checkbox {width: 20px}
+.usertable .table-username {width: 150px}
+.usertable .table-action {width: 200px}
+
+.usertable th, td {
+    border-bottom: 1px solid #ddd;
+    padding: 3px;
+}
+
+.usertable tr {
+    text-align: left;
+}
+
+.usertable tr:hover {
+    background-color: #f5f5f5;
+}
+
+/*div {
+    border: 1px solid black;
+}*/
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
new file mode 100644
index 0000000..1d7b509
--- /dev/null
+++ b/website/views/adminpanel.php
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <link rel="stylesheet" type="text/css" href="astyle.css">
+        <title>Admin Panel</title>
+    </head>
+    <body>
+        <div class="content">
+            <div class="admin-panel">
+                <form action="index.html" method="post">
+                <div class="admin-options">
+                    <form action="index.html" method="post">
+                        <div class="admin-searchbar">
+                            <h2>Search</h2>
+                            <input type="text" name="search" class="admin-searchinput"> <br>
+                            <input type="submit" value="Search">
+                        </div>
+                        <div class="admin-filter">
+                            <h2>Show users:</h2>
+                            <input type="checkbox" name="status" value="Active"> Active <br>
+                            <input type="checkbox" name="status" value="Muted"> Muted <br>
+                            <input type="checkbox" name="status" value="Banned"> Banned
+                        </div>
+                    </form>
+                        <div class="admin-actions">
+                            <h2>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>
+                            <input type="submit" value="Confirm">
+                        </div>
+                </div>
+                    <div class="admin-users">
+                        <h2>Users:</h2>
+                        <table class="usertable">
+                            <tr style="text-align: left;">
+                                <th><input type="checkbox" name="checkall"></th>
+                                <th>User</th>
+                                <th>Ban reason</th>
+                                <th style="width: 200px;">Action</th>
+                            </tr>
+                            <tr>
+                                <td><input type="checkbox" name="check1"></td>
+                                <td>John Smith</td>
+                                <td>unregulated time travel</td>
+                                <td>
+                                    <form class="admin-useraction" action="index.html" method="post">
+                                        <select class="action" name="actions">
+                                            <option value="mute">Mute</option>
+                                            <option value="ban">Ban</option>
+                                            <option value="unban">Unban</option>
+                                        </select>
+                                        <input type="submit" value="Confirm">
+                                    </form>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><input type="checkbox" name="check1"></td>
+                                <td>poey jokeaim</td>
+                                <td>l33t h4xx</td>
+                                <td>
+                                    <form class="admin-useraction" action="index.html" method="post">
+                                        <select class="action" name="actions">
+                                            <option value="mute">Mute</option>
+                                            <option value="ban">Ban</option>
+                                            <option value="unban">Unban</option>
+                                        </select>
+                                        <input type="submit" value="Confirm">
+                                    </form>
+                                </td>
+                            </tr>
+
+                        </table>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/website/views/head.php b/website/views/head.php
index 3266463..4444d97 100644
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -13,7 +13,7 @@
         @import url("styles/header.css");
         @import url("styles/menu.css");
         @import url("styles/footer.css");
-
+        @import url("styles/adminpanel.css");
         @import url("styles/chat.css");
     </style>
 </head>

From cfa119fef0585306525f897e5e54fb7ea0ecb623 Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Thu, 12 Jan 2017 11:54:56 +0100
Subject: [PATCH 2/3] added check all box

---
 website/styles/adminpanel.css | 10 ++++------
 website/views/adminpanel.php  | 26 ++++++++++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css
index 0bd8f1c..15ecfdc 100644
--- a/website/styles/adminpanel.css
+++ b/website/styles/adminpanel.css
@@ -6,7 +6,10 @@
     box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
 }
 
-.admin-options {
+.admin-actions {
+    display: inline-block;
+    margin: 10px;
+    vertical-align: top;
 }
 
 .admin-searchbar {
@@ -28,11 +31,6 @@
     margin-right: 100px;
 }
 
-.admin-actions {
-    display: inline-block;
-    margin: 10px;
-    vertical-align: top;
-}
 
 .admin-users {
     margin: 10px;
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index 1d7b509..1a9d90b 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -4,6 +4,17 @@
         <meta charset="utf-8">
         <link rel="stylesheet" type="text/css" href="astyle.css">
         <title>Admin Panel</title>
+        <script type="text/javascript">
+        function checkAll(allbox) {
+            var checkboxes = document.getElementsByName('check1');
+
+            for (var i = 0; i < checkboxes.length; i++) {
+                if (checkboxes[i].type == 'checkbox') {
+                    checkboxes[i].checked = allbox.checked;
+                }
+            }
+        }
+        </script>
     </head>
     <body>
         <div class="content">
@@ -30,15 +41,18 @@
                             <input type="radio" name="actions" value="unban"> Unban <br> <br>
                             <input type="submit" value="Confirm">
                         </div>
-                </div>
+                    </div>
+                    <br>
                     <div class="admin-users">
                         <h2>Users:</h2>
                         <table class="usertable">
-                            <tr style="text-align: left;">
-                                <th><input type="checkbox" name="checkall"></th>
-                                <th>User</th>
-                                <th>Ban reason</th>
-                                <th style="width: 200px;">Action</th>
+                            <tr>
+                                <th class="table-checkbox">
+                                    <input type="checkbox" name="checkall" onchange="checkAll(this)">
+                                </th>
+                                <th class="table-username">User</th>
+                                <th class="table-comment">Ban reason</th>
+                                <th class="table-action">Action</th>
                             </tr>
                             <tr>
                                 <td><input type="checkbox" name="check1"></td>

From 96c114cc103df2ee6ac5cca9853b0f1d0edc906b Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Thu, 12 Jan 2017 11:59:48 +0100
Subject: [PATCH 3/3] added ban status

---
 website/styles/adminpanel.css | 1 +
 website/views/adminpanel.php  | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css
index 15ecfdc..f22de20 100644
--- a/website/styles/adminpanel.css
+++ b/website/styles/adminpanel.css
@@ -42,6 +42,7 @@
 
 .usertable .table-checkbox {width: 20px}
 .usertable .table-username {width: 150px}
+.usertable .table-status {width: 100px}
 .usertable .table-action {width: 200px}
 
 .usertable th, td {
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index 1a9d90b..2723e40 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -51,12 +51,14 @@
                                     <input type="checkbox" name="checkall" onchange="checkAll(this)">
                                 </th>
                                 <th class="table-username">User</th>
-                                <th class="table-comment">Ban reason</th>
+                                <th class="table-status">Status</th>
+                                <th class="table-comment">Comment</th>
                                 <th class="table-action">Action</th>
                             </tr>
                             <tr>
                                 <td><input type="checkbox" name="check1"></td>
                                 <td>John Smith</td>
+                                <td>Banned</td>
                                 <td>unregulated time travel</td>
                                 <td>
                                     <form class="admin-useraction" action="index.html" method="post">
@@ -72,6 +74,7 @@
                             <tr>
                                 <td><input type="checkbox" name="check1"></td>
                                 <td>poey jokeaim</td>
+                                <td>Banned</td>
                                 <td>l33t h4xx</td>
                                 <td>
                                     <form class="admin-useraction" action="index.html" method="post">

	User	Ban reason	Action
	John Smith	unregulated time travel	+ + + + +
	poey jokeaim	l33t h4xx	+ + + + +
	User	Ban reason	Action
+ +	User	Ban reason	Action
	User	Ban reason	Status	Comment	Action
	John Smith	Banned	unregulated time travel	@@ -72,6 +74,7 @@
	poey jokeaim	Banned	l33t h4xx