diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-01 13:49:53 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-01 13:49:53 +0100 |
| commit | b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d (patch) | |
| tree | 7409f78a360d237bb61c1b590a4d3e6412914727 /view | |
| parent | af75b77253bf051b9e3f486809bbabcd3c415732 (diff) | |
| parent | 94d874c0b2b5e719af3aa676d015307bab514b6a (diff) | |
| download | volse-hubzilla-b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d.tar.gz volse-hubzilla-b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d.tar.bz2 volse-hubzilla-b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/chat.tpl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 19b3425da..0ebe879a1 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,3 +1,4 @@ +<h1>{{$room_name}}</h1> <div id="chatContainer" style="height: 100%; width: 100%;"> <div id="chatTopBar" style="float: left; height: 400px; width: 650px; overflow-y: auto;"> @@ -65,7 +66,7 @@ function update_inroom(inroom) { var count = inroom.length; $.each( inroom, function(index, item) { var newNode = document.createElement('div'); - $(newNode).html('<img style="height: 32px; width: 32px;" src="' + item.img + '" alt="' + item.name + '" />'); + $(newNode).html('<img style="height: 32px; width: 32px;" src="' + item.img + '" alt="' + item.name + '" /> ' + item.status + '<br />' + item.name + '<br/>'); html.appendChild(newNode); }); $('#chatUsers').html(html); @@ -77,8 +78,10 @@ function update_chats(chats) { $.each( chats, function(index, item) { last_chat = item.id; var newNode = document.createElement('div'); - $(newNode).html('<div style="margin-bottom: 5px; clear: both;"><img style="height: 32px; width: 32px; float: left;" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body; style="float: left; width: 80%;">' + item.text + '</div></div>'); + $(newNode).html('<div style="margin-bottom: 5px; clear: both;"><img style="height: 32px; width: 32px; float: left;" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body" style="float: left; width: 80%; margin-left: 15px; font-size: 14px;">' + item.name + ' <span class="autotime" title="' + item.isotime + '">' + item.localtime + '</span><br />' + item.text + '</div></div>'); $('#chatLineHolder').append(newNode); + $(".autotime").timeago(); + }); var elem = document.getElementById('chatTopBar'); elem.scrollTop = elem.scrollHeight; |