diff options
Diffstat (limited to 'webclient/home')
| -rw-r--r-- | webclient/home/home-controller.js | 11 | ||||
| -rw-r--r-- | webclient/home/home.html | 29 |
2 files changed, 35 insertions, 5 deletions
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js index 85e8990c29..e35219bebb 100644 --- a/webclient/home/home-controller.js +++ b/webclient/home/home-controller.js @@ -53,6 +53,8 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen // Add room_alias & room_display_name members angular.extend(room, matrixService.getRoomAliasAndDisplayName(room)); + + eventHandlerService.setRoomVisibility(room.room_id, "public"); } } ); @@ -117,6 +119,10 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen matrixService.getDisplayName($scope.config.user_id).then( function(response) { $scope.profile.displayName = response.data.displayname; + var config = matrixService.config(); + config.display_name = response.data.displayname; + matrixService.setConfig(config); + matrixService.saveConfig(); }, function(error) { $scope.feedback = "Can't load display name"; @@ -142,4 +148,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 c1f9643839..5a1e18e1de 100644 --- a/webclient/home/home.html +++ b/webclient/home/home.html @@ -24,11 +24,30 @@ <h3>Public rooms</h3> - <div class="public_rooms" ng-repeat="room in public_rooms"> - <div> - <a href="#/room/{{ room.room_alias ? room.room_alias : room.room_id }}" >{{ room.room_alias }}</a> - </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> |