From 7ee5288849dc687515f8ad499e7c95c73f842394 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Wed, 27 Aug 2014 16:58:44 +0200 Subject: Added the recents component at the left hand side of the room page --- webclient/app.css | 9 +++++++++ webclient/room/room.html | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'webclient') diff --git a/webclient/app.css b/webclient/app.css index bc23f76f00..e2526dcbaa 100644 --- a/webclient/app.css +++ b/webclient/app.css @@ -387,6 +387,15 @@ h1 { padding-bottom: 5px; } +/*** Recents in the room page ***/ +#roomRecentsTableWrapper { + float: left; + max-width: 320px; + margin-right: 20px; + height: 100%; + overflow-y: auto; +} + /*** Profile ***/ .profile-avatar { diff --git a/webclient/room/room.html b/webclient/room/room.html index c167819f15..236ca0a89b 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -7,7 +7,11 @@
{{ room_alias || room_id }}
- + +
+
+
+
-- cgit 1.5.1 From d9155b6a25d706edb85706a1c0cff6dacbdc1640 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Wed, 27 Aug 2014 17:20:41 +0200 Subject: Highlight the current room in the recents list --- webclient/app.css | 4 ++++ webclient/recents/recents-controller.js | 6 +++++- webclient/recents/recents.html | 5 ++++- webclient/room/room-controller.js | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) (limited to 'webclient') diff --git a/webclient/app.css b/webclient/app.css index e2526dcbaa..8abdd1cb44 100644 --- a/webclient/app.css +++ b/webclient/app.css @@ -368,6 +368,10 @@ h1 { background-color: #f8f8ff; } +.recentsRoomSelected { + background-color: #eee; +} + .recentsRoomName { font-size: 16px; padding-top: 7px; diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js index a9805fc38a..8f8b08d5bd 100644 --- a/webclient/recents/recents-controller.js +++ b/webclient/recents/recents-controller.js @@ -20,7 +20,11 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService']) .controller('RecentsController', ['$scope', 'matrixService', 'eventHandlerService', 'eventStreamService', function($scope, matrixService, eventHandlerService, eventStreamService) { $scope.rooms = {}; - + + // $scope of the parent where the recents component is included can override this value + // in order to highlight a specific room in the list + $scope.recentsSelectedRoomID; + $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) { var config = matrixService.config(); if (event.state_key === config.user_id && event.content.membership === "invite") { diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index 6d2864ac97..6fda6c5c6b 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -1,6 +1,9 @@
- +
{{ room.room_display_name }} diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index f49deaa489..641ccddce7 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -327,6 +327,9 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities']) var onInit2 = function() { eventHandlerService.reInitRoom($scope.room_id); + // Make recents highlight the current room + $scope.recentsSelectedRoomID = $scope.room_id; + // Join the room matrixService.join($scope.room_id).then( function() { -- cgit 1.5.1 From 234c50b83480e65d645d4f18912f4b023bdc3954 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Wed, 27 Aug 2014 18:00:08 +0200 Subject: BF: mFileInput dependency got lost somewhere and upload buttons did not work anymore --- webclient/room/room-controller.js | 2 +- webclient/settings/settings-controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'webclient') diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 641ccddce7..6c98db269e 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -angular.module('RoomController', ['ngSanitize', 'mUtilities']) +angular.module('RoomController', ['ngSanitize', 'mFileInput', 'mUtilities']) .controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', 'mFileUpload', 'mUtilities', '$rootScope', function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService, mFileUpload, mUtilities, $rootScope) { 'use strict'; diff --git a/webclient/settings/settings-controller.js b/webclient/settings/settings-controller.js index 5d3f7cb2b8..f7d5e8eb75 100644 --- a/webclient/settings/settings-controller.js +++ b/webclient/settings/settings-controller.js @@ -16,7 +16,7 @@ limitations under the License. 'use strict'; -angular.module('SettingsController', ['matrixService', 'mFileUpload']) +angular.module('SettingsController', ['matrixService', 'mFileUpload', 'mFileInput']) .controller('SettingsController', ['$scope', 'matrixService', 'mFileUpload', function($scope, matrixService, mFileUpload) { $scope.config = matrixService.config(); -- cgit 1.5.1 From f53c4300fd3a83b4bb40fc93cad4dbf0e53d1b52 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 27 Aug 2014 17:03:16 +0100 Subject: improve iOS layout a bit --- webclient/app.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'webclient') diff --git a/webclient/app.css b/webclient/app.css index 8abdd1cb44..16f9dd72b7 100644 --- a/webclient/app.css +++ b/webclient/app.css @@ -7,6 +7,16 @@ .leftBlock { width: 8em ! important; + font-size: 8px ! important; + } + + .rightBlock { + width: 0px ! important; + display: none ! important; + } + + .avatar { + width: 36px ! important; } #header, -- cgit 1.5.1