diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-05 16:45:59 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-05 16:45:59 +0200 |
| commit | dcf0a6fbfd76257fbf3193ff128505dc0965f67d (patch) | |
| tree | 7ee705d485ea1200863205ce8c167e707875cc73 | |
| parent | Fixed empty display name (content.displayname in a room member can be null) (diff) | |
| download | synapse-dcf0a6fbfd76257fbf3193ff128505dc0965f67d.tar.xz | |
Display ban & kick reason
Diffstat (limited to '')
| -rw-r--r-- | webclient/recents/recents.html | 6 | ||||
| -rw-r--r-- | webclient/room/room.html | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index 1c059249bf..280d0632ab 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -34,11 +34,17 @@ {{ {"join": "kicked", "ban": "unbanned"}[room.lastMsg.content.prev] }} {{ room.lastMsg.state_key | mUserDisplayName: room.room_id }} </span> + <span ng-if="'join' === room.lastMsg.content.prev && room.lastMsg.content.reason"> + : {{ room.lastMsg.content.reason }} + </span> </span> <span ng-if="'invite' === room.lastMsg.content.membership || 'ban' === room.lastMsg.content.membership"> {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} {{ {"invite": "invited", "ban": "banned"}[room.lastMsg.content.membership] }} {{ room.lastMsg.state_key | mUserDisplayName: room.room_id }} + <span ng-if="'ban' === room.lastMsg.content.prev && room.lastMsg.content.reason"> + : {{ room.lastMsg.content.reason }} + </span> </span> </div> diff --git a/webclient/room/room.html b/webclient/room/room.html index 147113987e..5bd2cc92d5 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -62,13 +62,20 @@ {{ members[msg.user_id].displayname || msg.user_id }} {{ {"join": "kicked", "ban": "unbanned"}[msg.content.prev] }} {{ members[msg.state_key].displayname || msg.state_key }} + <span ng-if="'join' === msg.content.prev && msg.content.reason"> + : {{ msg.content.reason }} + </span> </span> </span> <span ng-if="'invite' === msg.content.membership || 'ban' === msg.content.membership"> {{ members[msg.user_id].displayname || msg.user_id }} {{ {"invite": "invited", "ban": "banned"}[msg.content.membership] }} {{ members[msg.state_key].displayname || msg.state_key }} - </span> + <span ng-if="'ban' === msg.content.prev && msg.content.reason"> + : {{ msg.content.reason }} + </span> + </span> + <span ng-show='msg.content.msgtype === "m.emote"' ng-bind-html="'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"/> <span ng-show='msg.content.msgtype === "m.text"' ng-class="msg.echo_msg_state" |