summary refs log tree commit diff
path: root/webclient/home
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-12 17:20:06 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-12 17:20:06 +0100
commit1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29 (patch)
tree74528065c199aa426611c41a1351f54e35fa3f3a /webclient/home
parentInitial hack at some RoomMemberStore unit tests (diff)
parentMake the state resolution use actual power levels rather than taking them fro... (diff)
downloadsynapse-1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29.tar.xz
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Conflicts:
	synapse/storage/pdu.py
Diffstat (limited to 'webclient/home')
-rw-r--r--webclient/home/home-controller.js5
-rw-r--r--webclient/home/home.html39
2 files changed, 29 insertions, 15 deletions
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js
index 85e8990c29..c0c4ea11aa 100644
--- a/webclient/home/home-controller.js
+++ b/webclient/home/home-controller.js
@@ -142,4 +142,9 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
 
         refresh();
     };
+
+    // Clean data when user logs out
+    $scope.$on(eventHandlerService.RESET_EVENT, function() {
+        $scope.public_rooms = [];
+    });
 }]);
diff --git a/webclient/home/home.html b/webclient/home/home.html
index 023ae1a40c..5a1e18e1de 100644
--- a/webclient/home/home.html
+++ b/webclient/home/home.html
@@ -24,21 +24,30 @@
 
     <h3>Public rooms</h3>
     
-    <div class="public_rooms" ng-repeat="room in public_rooms | orderBy:'room_display_name'">
-        <div class="publicRoomEntry">
-            <a href="#/room/{{ room.room_alias ? room.room_alias : room.room_id }}" 
-                ng-class="room.room_display_name.toLowerCase().indexOf('#matrix:') === 0 ? 'roomHighlight' : ''">
-                {{ room.room_display_name }}
-            </a>
-            <div ng-class="room.room_display_name.toLowerCase().indexOf('#matrix:') === 0 ? 'publicRoomJoinedUsers roomHighlight' : 'publicRoomJoinedUsers'"
-            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>
+    <table class="publicTable">
+        <tbody ng-repeat="room in public_rooms | orderBy:'room_display_name'"
+               class="publicRoomEntry"
+               ng-class="room.room_display_name.toLowerCase().indexOf('#matrix:') === 0 ? 'roomHighlight' : ''">
+            <tr>
+                <td class="publicRoomEntry">
+                    <a href="#/room/{{ room.room_alias ? room.room_alias : room.room_id }}"  >
+                        {{ room.room_display_name }}
+                    </a>
+                </td>
+                <td>
+                    <div class="publicRoomJoinedUsers"
+                         ng-show="room.num_joined_members">
+                        {{ room.num_joined_members }} {{ room.num_joined_members == 1 ? 'user' : 'users' }}
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" class="publicRoomTopic">
+                    {{ room.topic }}
+                </td>
+            </tr>
+        </tbody>
+    </table>
     <br/>
     
     <div>