diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 17:20:06 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 17:20:06 +0100 |
| commit | 1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29 (patch) | |
| tree | 74528065c199aa426611c41a1351f54e35fa3f3a /webclient/recents/recents.html | |
| parent | Initial hack at some RoomMemberStore unit tests (diff) | |
| parent | Make the state resolution use actual power levels rather than taking them fro... (diff) | |
| download | synapse-1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29.tar.xz | |
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Conflicts: synapse/storage/pdu.py
Diffstat (limited to 'webclient/recents/recents.html')
| -rw-r--r-- | webclient/recents/recents.html | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index 4726b61cb3..3d736b6694 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -9,7 +9,9 @@ {{ room.room_id | mRoomName }} </td> <td class="recentsRoomSummaryTS"> - {{ room.numUsersInRoom || '1' }} {{ room.numUsersInRoom == 1 ? 'user' : 'users' }} + <span ng-show="undefined !== room.numUsersInRoom"> + {{ room.numUsersInRoom || '1' }} {{ room.numUsersInRoom == 1 ? 'user' : 'users' }} + </span> </td> <td class="recentsRoomSummaryTS"> {{ (room.lastMsg.ts) | date:'MMM d HH:mm' }} @@ -64,7 +66,7 @@ </div> <div ng-switch-when="m.emote"> - <span ng-bind-html="'* ' + (room.lastMsg.user_id) + ' ' + room.lastMsg.content.body | linky:'_blank'"> + <span ng-bind-html="'* ' + (room.lastMsg.user_id | mUserDisplayName: room.room_id) + ' ' + room.lastMsg.content.body | linky:'_blank'"> </span> </div> @@ -74,6 +76,14 @@ </div> </div> + <div ng-switch-when="m.room.topic"> + {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} changed the topic to: {{ room.lastMsg.content.topic }} + </div> + + <div ng-switch-when="m.room.name"> + {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} changed the room name to: {{ room.lastMsg.content.name }} + </div> + <div ng-switch-default> <div ng-if="room.lastMsg.type.indexOf('m.call.') === 0"> Call |