From 60a9f27edbc961f5ae3b8daf1060dde5b3cc407d Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 15 Aug 2014 17:58:51 +0100 Subject: [PATCH 01/29] Formatting --- webclient/room/room-controller.js | 40 +++++++++++++++---------------- webclient/room/room.html | 3 ++- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 1b921325b3..3fc45bc782 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -16,30 +16,30 @@ limitations under the License. angular.module('RoomController', []) // FIXME move directives outta here! -.directive("keepScroll", function(){ - return { - controller : function($scope){ - var element = 0; - this.setElement = function(el){ - element = el; - } - this.addItem = function(item){ - element.scrollTop = (element.scrollTop+item.clientHeight+1); //1px for margin - }; - }, - link : function(scope,el,attr, ctrl) { - ctrl.setElement(el[0]); - } - }; +.directive("keepScroll", function() { + return { + controller : function($scope) { + var element = 0; + this.setElement = function(el){ + element = el; + } + this.addItem = function(item){ + element.scrollTop = (element.scrollTop + item.clientHeight); + }; + }, + link : function(scope, el, attr, ctrl) { + ctrl.setElement(el[0]); + } + }; }) // FIXME move directives outta here! .directive("scrollItem", function(){ - return{ - require : "^keepScroll", - link : function(scope, el, att, scrCtrl){ - scrCtrl.addItem(el[0]); + return { + require : "^keepScroll", + link : function(scope, el, att, scrCtrl){ + scrCtrl.addItem(el[0]); + } } - } }) .controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService) { diff --git a/webclient/room/room.html b/webclient/room/room.html index e2a4c221c6..0285f9e7e0 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -63,7 +63,7 @@ - {{ feedback }} + @@ -87,6 +87,7 @@ + {{ feedback }}
{{ state.stream_failure.data.error || "Connection failure" }}
From 9f7c5f161cc7eaa1e23994955fc2aa29dd68dad7 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Aug 2014 23:24:42 +0100 Subject: [PATCH 02/29] switch some elements from being styled by class to styled by id --- webclient/app.css | 34 +++++++++++++++++----------------- webclient/index.html | 6 +++--- webclient/login/login.html | 4 ++-- webclient/room/room.html | 24 ++++++++++++------------ webclient/rooms/rooms.html | 4 ++-- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/webclient/app.css b/webclient/app.css index 122f25c9ff..b49ebef1ba 100644 --- a/webclient/app.css +++ b/webclient/app.css @@ -10,7 +10,7 @@ h1 { /*** Overall page layout ***/ -.page { +#page { position: absolute; top: 80px; bottom: 100px; @@ -20,13 +20,13 @@ h1 { margin: 20px; } -.wrapper { +#wrapper { margin: auto; max-width: 1280px; height: 100%; } -.roomName { +#roomName { max-width: 1280px; width: 100%; text-align: right; @@ -36,7 +36,7 @@ h1 { margin-bottom: 10px; } -.controlPanel { +#controlPanel { position: absolute; bottom: 0px; width: 100%; @@ -44,39 +44,39 @@ h1 { border-top: #aaa 1px solid; } -.controls { +#controls { max-width: 1280px; padding: 12px; margin: auto; } -.inputBarTable { +#inputBarTable { width: 100%; } -.inputBarTable tr td { +#inputBarTable tr td { padding: 1px 4px; } -.mainInput { +#mainInput { width: 100%; } /*** Participant list ***/ -.usersTableWrapper { +#usersTableWrapper { float: right; width: 120px; height: 100%; overflow-y: auto; } -.usersTable { +#usersTable { width: 100%; border-collapse: collapse; } -.usersTable td { +#usersTable td { padding: 0px; } @@ -124,21 +124,21 @@ h1 { /*** Message table ***/ -.messageTableWrapper { +#messageTableWrapper { height: 100%; margin-right: 140px; overflow-y: auto; width: auto; } -.messageTable { +#messageTable { margin: auto; max-width: 1280px; width: 100%; border-collapse: collapse; } -.messageTable td { +#messageTable td { padding: 0px; } @@ -235,18 +235,18 @@ h1 { /******************************/ -.header { +#header { padding-left: 20px; padding-right: 20px; max-width: 1280px; margin: auto; } -.header-buttons { +#header-buttons { float: right; } -.config { +#config { position: absolute; z-index: 100; top: 100px; diff --git a/webclient/index.html b/webclient/index.html index 387505372a..013f70cba3 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -24,9 +24,9 @@ -
+ -
+
Home server: {{ config.homeserver }}
User ID: {{ config.user_id }}
Access token: {{ config.access_token }}
diff --git a/webclient/login/login.html b/webclient/login/login.html index a8b2b1f12d..3acd6976c5 100644 --- a/webclient/login/login.html +++ b/webclient/login/login.html @@ -1,6 +1,6 @@