summary refs log tree commit diff
path: root/webclient/room/room.html
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-08 15:36:52 -0700
committerKegan Dougal <kegan@matrix.org>2014-09-08 15:36:52 -0700
commit324020d5fe212badfbd38137adc8dcecfdc15980 (patch)
tree050b5568fab3f0126e65dbebacc530b3ce5481e0 /webclient/room/room.html
parentUpdate jsfiddles to have more helpful error messages when there is no connect... (diff)
downloadsynapse-324020d5fe212badfbd38137adc8dcecfdc15980.tar.xz
Display the room topic in the room, underneath the name of the room.
Diffstat (limited to 'webclient/room/room.html')
-rw-r--r--webclient/room/room.html9
1 files changed, 7 insertions, 2 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html
index 5bd2cc92d5..4be2482f96 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -2,8 +2,13 @@
 
     <div id="roomHeader">
         <a href ng-click="goToPage('/')"><img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/></a>
-        <div id="roomName">
-            {{ room_id  | mRoomName }}
+        <div class="roomHeaderInfo">
+            <div id="roomName">
+                {{ room_id  | mRoomName }}
+            </div>
+            <div id="roomTopic" ng-show="events.rooms[room_id]['m.room.topic'].content.topic">
+                {{ events.rooms[room_id]['m.room.topic'].content.topic }}
+            </div>
         </div>
     </div>