Merge branch 'hendrik-post' into 'master'

Hendrik post See merge request !185
2017-02-02 13:58:17 +01:00
parent 5c1b2d1b21 93e63111de
commit a92b0fe892
4 changed files with 58 additions and 31 deletions
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -1,4 +1,8 @@
 <div class="content">
+    <div class='platform alertbox' id="alertbox">
+        <span id="alerttext"></span>
+    </div>
+
    <div class="user-box">
        <img class="profile-picture main-picture <?= $user["onlinestatus"] ?>" src="<?= $user["profilepicture"] ?>"><br />
        <div class="platform">