From 7b8e24a588c394ff5c735b966078fe282dc5b833 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 24 Sep 2014 01:12:59 +0100 Subject: close buttons on recents (SYWEB-68) --- webclient/recents/recents.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'webclient/recents') diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index edfc1677eb..ff811b2b8d 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -2,7 +2,7 @@ -- cgit 1.4.1 From b02bb18a701e4cbb4397aedad7131b3191e69edb Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Wed, 24 Sep 2014 12:48:24 +0200 Subject: Fixed SYWEB-28: show displayname changes in recents --- webclient/recents/recents.html | 49 ++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 21 deletions(-) (limited to 'webclient/recents') diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index ff811b2b8d..9cbdcd357a 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -33,28 +33,35 @@
- - {{ lastMsg.state_key | mUserDisplayName: room.room_id}} joined - - - - {{lastMsg.state_key | mUserDisplayName: room.room_id }} left - - - {{ lastMsg.user_id | mUserDisplayName: room.room_id }} - {{ {"join": "kicked", "ban": "unbanned"}[lastMsg.content.prev] }} - {{ lastMsg.state_key | mUserDisplayName: room.room_id }} - - - : {{ lastMsg.content.reason }} + + + + {{ lastMsg.state_key | mUserDisplayName: room.room_id }} joined + + + + {{lastMsg.state_key | mUserDisplayName: room.room_id }} left + + + {{ lastMsg.user_id | mUserDisplayName: room.room_id }} + {{ {"join": "kicked", "ban": "unbanned"}[lastMsg.content.prev] }} + {{ lastMsg.state_key | mUserDisplayName: room.room_id }} + + + : {{ lastMsg.content.reason }} + + + + {{ lastMsg.user_id | mUserDisplayName: room.room_id }} + {{ {"invite": "invited", "ban": "banned"}[lastMsg.content.membership] }} + {{ lastMsg.state_key | mUserDisplayName: room.room_id }} + + : {{ lastMsg.content.reason }} + + - - - {{ lastMsg.user_id | mUserDisplayName: room.room_id }} - {{ {"invite": "invited", "ban": "banned"}[lastMsg.content.membership] }} - {{ lastMsg.state_key | mUserDisplayName: room.room_id }} - - : {{ lastMsg.content.reason }} + + {{ lastMsg.user_id }} changed their display name from {{ lastMsg.prev_content.displayname }} to {{ lastMsg.content.displayname }}
-- cgit 1.4.1
@@ -19,6 +19,8 @@ {{ lastMsg = eventHandlerService.getLastMessage(room.room_id, true);"" }} {{ (lastMsg.ts) | date:'MMM d HH:mm' }} + + close