aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-03 15:27:26 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-03 15:27:26 +0200
commit470f14b919b5afa1d8e7e8a213b0bd4889619fc2 (patch)
treef182e23e4f90267d8cf4b0cf259043734dc9f1ba /view
parent5634a4bb6105fbc303a35d909c3d782364da4b9f (diff)
parent53311a30ad5399e6e981aaab11ffa13af926a3d2 (diff)
downloadvolse-hubzilla-470f14b919b5afa1d8e7e8a213b0bd4889619fc2.tar.gz
volse-hubzilla-470f14b919b5afa1d8e7e8a213b0bd4889619fc2.tar.bz2
volse-hubzilla-470f14b919b5afa1d8e7e8a213b0bd4889619fc2.zip
Merge branch 'master' into dev
Diffstat (limited to 'view')
-rw-r--r--view/tpl/chat.tpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index fbc00bf88..19b025820 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -165,11 +165,11 @@ function update_chats(chats) {
if(item.self) {
newNode.setAttribute('class', 'chat-item-self clear');
- $(newNode).html('<div class="chat-body-self"><div class="chat-item-title-self"><span class="chat-item-name-self">' + item.name + ' </span><span class="autotime chat-item-time-self" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text-self">' + item.text + '</div></div><img class="chat-item-photo-self" src="' + item.img + '" alt="' + item.name + '" />');
+ $(newNode).html('<div class="chat-body-self"><div class="chat-item-title-self wall-item-ago"><span class="chat-item-name-self">' + item.name + ' </span><span class="autotime chat-item-time-self" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text-self">' + item.text + '</div></div><img class="chat-item-photo-self" src="' + item.img + '" alt="' + item.name + '" />');
}
else {
newNode.setAttribute('class', 'chat-item clear');
- $(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>');
+ $(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title wall-item-ago"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>');
}
$('#chatLineHolder').append(newNode);
$(".autotime").timeago();