Merge branch 'master' into lars-chat

2017-01-24 14:26:48 +01:00
parent a88483ae47 ee6b55bd91
commit dbb23922d8
13 changed files with 224 additions and 90 deletions
--- a/website/public/img/avatar-standard.png
+++ b/website/public/img/avatar-standard.png
--- a/website/public/img/notbad.jpg
+++ b/website/public/img/notbad.jpg
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -12,23 +12,28 @@
 </head>
 <body>
 <?php
-$notImplemented = new settingsMessage("angry", "Deze functie werkt nog niet :(");
-
+$alertClass;
+$alertMessage;
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    switch ($_POST["form"]) {
-        case "profile":
-            $result = updateSettings();
-            break;
-        case "password":
-            $result = changePassword();
-            break;
-        case "email":
-            $result = changeEmail();
-            break;
-        case "picture":
-            updateProfilePicture();
-            $result = new settingsMessage("happy", "Deze melding doet nog niks nuttigs.");
-            break;
+    try {
+        switch ($_POST["form"]) {
+            case "profile":
+                updateSettings();
+                break;
+            case "password":
+                changePassword();
+                break;
+            case "email":
+                changeEmail();
+                break;
+            case "picture":
+                updateAvatar();
+                break;
+
+        }
+    } catch (AlertMessage $w) {
+        $alertClass = $w->getClass();
+        $alertMessage = $w->getMessage();
    }
 }
 include("../views/main.php");
--- a/website/public/styles/search.css
+++ b/website/public/styles/search.css
@@ -14,4 +14,16 @@
 .searchleft, .searchright {
    display: inline-block;
    vertical-align: top;
+}
+
+.user-pageselect, .searchleft h4, .group-pageselect, .searchright h4 {
+    display: inline-block;
+}
+
+.user-pageselect, .group-pageselect {
+    float: right;
+}
+
+li.search-item:hover{
+    background-color: #EEE;
 }