Merge branch 'lars' into 'master'

Lars

See merge request !186

website/public/bits/niet_slecht.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: polo
+ * Date: 2-2-17
+ * Time: 14:02
+ */

website/public/js/chat.js

@@ -25,6 +25,9 @@ function loadMessages() {
                 addMessages(messages);
                 $("#lastID").val(messages[messages.length - 1].messageID);
             }
+
+            loadUnreadMessages();
+
             gettingMessages = false;
         });
     } else {
@@ -56,7 +59,7 @@ function addMessages(messages) {
     for(var i in messages) {
         // Initialize message variables.
         var thisDate = new Date(messages[i].creationdate.replace(/ /,"T"));
-        var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes();
+        var thisTime = thisDate.getHours() + ":" + ('0' + thisDate.getMinutes()).slice(-2);
         var type;
         thisDate.setHours(0,0,0,0);
 
@@ -78,6 +81,8 @@ function addMessages(messages) {
                     </div>';
             }
             previousDate = thisDate;
+            previousTime = thisTime;
+            previousType = type;
             messagesText += '<div class="chat-message"><div class="' + type + '">';
         // If it is not the first message, and has a different date/time/type then the previous message,
         } else if (type != previousType || thisTime != previousTime || thisDate.getTime() > previousDate.getTime()) {

website/views/head.php

@@ -2,7 +2,6 @@
 <meta name="description" content="MyHyvesbook+ is het sociaal media voor alle coole mensen.">
 <meta name="keywords" content="MyHyvesbookPlus,Myhyvesbook+,sociaal,media">
 <meta name="author" content="MyHyvesbookplus corporation">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>MyHyvesbook+</title>
 <!-- Add your javascript files here. -->
 <script src="js/jquery.js"></script>