MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Hendrik testing #64

Merged
11342374 merged 35 commits from hendrik-testing into master 2017-01-18 16:08:50 +01:00
Conversation 2 Commits 35 Files Changed 27 +4 -32
4 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7469a10f13 - Show all commits

2
website/public/js/chat.js
View File

@@ -34,7 +34,7 @@ function sendMessage() {
function addMessages(messages) {
for(i in messages) {
if (messages[i].origin == 2) {
if (messages[i].destination == $(".destinationID").val()) {
type = "chat-message-self";
} else {
type = "chat-message-other";

4
website/public/styles/chat.css
View File

@@ -16,10 +16,6 @@
overflow-y: auto;
}
.chat-left .friend-item {
cursor: pointer;
}
.chat-right {
width: calc(100% - 256px - 40px);
height: calc(100% - 80px);

28
website/views/chat-view.php
View File

@@ -47,30 +47,6 @@
</nav>
<div class="chat-right right">
<div id="chat-history" class="chat-history platform">
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-self">Hi!</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-other">Hi!</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-self">How it's going?</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-other">Hi!</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>-->
<!-- </div>-->
</div>
<form id="lastIDForm">
<input type="hidden"
@@ -81,7 +57,7 @@
<input type="hidden"
name="destination"
class="destinationID"
value="666"
value=""
/>
</form>
<div class="chat-field">
@@ -89,7 +65,7 @@
<input type="hidden"
name="destination"
class="destinationID"
value="666"
value=""
/>
<input type="submit"
value="Verstuur"