Merge branch 'marijn-chat' into 'lars-chat'

# Conflicts:
#   website/views/chat-view.php

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,22 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="8">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+            <item index="6" class="java.lang.String" itemvalue="li" />
+            <item index="7" class="java.lang.String" itemvalue="a" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

website/styles/chat.css

@@ -18,14 +18,14 @@
     display: inline-flex;
 
 }
-.chat-list, .chat-history {
+.chat-recent, .chat-history {
     border-radius: 20px;
     width: 100%;
     background-color: white;
 }
 
 /* List of chats. */
-.chat-list {
+.chat-recent {
     height: 600px;
     overflow-y: auto;
     padding: 10px;

website/views/chat-view.php

@@ -1,13 +1,17 @@
 <div class="content">
     <div class="chat">
         <div class="chat-left">
-            <div class="chat-list">
+            <nav class="chat-recent">
                 <h5>Chats</h5>
                 <a href="#"><div class="chat-conversation">
-                    <img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">
+                        <img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">
-                    Rudolf Leslo
+                        Rudolf Leslo
-                </div></a>
+                    </div></a>
-            </div>
+                <a href="#"><div class="chat-conversation">
+                        <img class="profile-picture" src=http://www.kpop-map.com/wp-content/uploads/2016/01/sm-rookies-kun-profile.jpg">
+                        Henk de Boer
+                    </div></a>
+            </nav>
         </div>
 
         <div class="chat-right">
@@ -49,6 +53,17 @@
                     >
                 </form>
             </div>
+
+            <form class="chat-field" method="post">
+                <input type="text"
+                       name="message"
+                       placeholder="Reageer..."
+                       required
+                >
+                <input type="submit"
+                       value="Verstuur"
+                >
+            </form>
         </div>
     </div>
 </div>