From 945b9af86e27c1b75f9b3ff6f7d9a1f2f0c58fec Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 16 Dec 2015 10:22:39 +0200 Subject: [PATCH 1/6] chat tpl changes --- templates/chats.tpl | 19 ++++++++++--------- templates/partials/chat_contact.tpl | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/templates/chats.tpl b/templates/chats.tpl index 1925754..03927a0 100644 --- a/templates/chats.tpl +++ b/templates/chats.tpl @@ -4,12 +4,13 @@
    - + +
  • + - - - - + +
    • +
@@ -19,11 +20,11 @@ [[error:chat-restricted]]
- -
+ +
-

{meta.username}

+

{usernames}

[[recent:title]] • [[modules:chat.seven_days]] • [[modules:chat.thirty_days]] • [[modules:chat.three_months]] @@ -41,6 +42,6 @@
[[modules:chat.no-messages]]
- +
diff --git a/templates/partials/chat_contact.tpl b/templates/partials/chat_contact.tpl index 20b7a5d..6e9f2e0 100644 --- a/templates/partials/chat_contact.tpl +++ b/templates/partials/chat_contact.tpl @@ -1,4 +1,4 @@ -
  • +
    @@ -8,4 +8,4 @@ {../username} {../teaser.content} -
    • \ No newline at end of file + \ No newline at end of file From dacb90a7f1830a18965ca638db981e77b45549c7 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 16 Dec 2015 10:24:31 +0200 Subject: [PATCH 2/6] fix chat switch in persona --- lib/client/chats.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/client/chats.js b/lib/client/chats.js index 39871f9..7ef4e58 100644 --- a/lib/client/chats.js +++ b/lib/client/chats.js @@ -2,12 +2,12 @@ define('persona/chats', ['components', 'forum/chats'], function(components, core var Chats = {}; Chats.init = function() { - components.get('chat/recent').off('click').on('click', 'li', function(e) { + components.get('chat/recent').off('click').on('click', '[component="chat/recent/room"]', function(e) { var env = utils.findBootstrapEnvironment(); if (env === 'xs' || env === 'sm') { - app.openChat($(this).attr('data-username'), $(this).attr('data-uid')); + app.openChat($(this).attr('data-roomid')); } else { - coreChats.switchChat(parseInt($(this).attr('data-uid'), 10), $(this).attr('data-username')); + coreChats.switchChat($(this).attr('data-roomid')); } }); }; From 979bbf1372a5f0e5c5bb3f77c9ea9efbec9e9b24 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 16 Dec 2015 13:36:19 +0200 Subject: [PATCH 3/6] added tag input to chat modal and chat page --- templates/chat.tpl | 6 ++++++ templates/chats.tpl | 3 +++ 2 files changed, 9 insertions(+) diff --git a/templates/chat.tpl b/templates/chat.tpl index e01371e..f80d9dd 100644 --- a/templates/chat.tpl +++ b/templates/chat.tpl @@ -2,6 +2,7 @@