summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-08 17:14:58 -0700
committerKegan Dougal <kegan@matrix.org>2014-09-08 17:14:58 -0700
commitdf50a6823fdc60cdb7cb3a6497b1067cca63fc33 (patch)
tree36e959710327757b77be8bb1b84c25320178defb
parentDisplay the room topic in the room, underneath the name of the room. (diff)
downloadsynapse-df50a6823fdc60cdb7cb3a6497b1067cca63fc33.tar.xz
Display public room topics if they exist on the public room list.
Diffstat (limited to '')
-rwxr-xr-xwebclient/app.css7
-rw-r--r--webclient/home/home.html3
2 files changed, 10 insertions, 0 deletions
diff --git a/webclient/app.css b/webclient/app.css
index 7c367df421..ab3d815e00 100755
--- a/webclient/app.css
+++ b/webclient/app.css
@@ -276,6 +276,13 @@ a:active  { color: #000; }
     float: right;
 }
 
+.publicRoomTopic {
+    color: #888;
+    font-size: 12px;
+    padding-right: 5px;
+    float: right;
+}
+
 #roomName {
     font-size: 16px;
     text-align: right;
diff --git a/webclient/home/home.html b/webclient/home/home.html
index 6d599e6849..023ae1a40c 100644
--- a/webclient/home/home.html
+++ b/webclient/home/home.html
@@ -34,6 +34,9 @@
             ng-show="room.num_joined_members">
                 {{ room.num_joined_members }} {{ room.num_joined_members == 1 ? 'user' : 'users' }}
             </div>
+            <div class="publicRoomTopic" ng-show="room.topic">
+                {{ room.topic }}
+            </div>
         </div>
     </div>
     <br/>