From 324020d5fe212badfbd38137adc8dcecfdc15980 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 8 Sep 2014 15:36:52 -0700
Subject: Display the room topic in the room, underneath the name of the room.

---
 webclient/room/room.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'webclient/room')

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>
 
-- 
cgit 1.5.1