From f2d0124651bc4e4384dd7f1e3c0da8b52e700af8 Mon Sep 17 00:00:00 2001 From: Martin Mrose Date: Tue, 24 Mar 2015 21:27:46 +0100 Subject: [PATCH 1/2] Increased height of chat --- app/css/app.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/css/app.css b/app/css/app.css index 459fa86..b2c0bdf 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -67,7 +67,7 @@ ul.chat { list-style: none; display: block; position: relative; - height: 200px; + height: 600px; overflow: auto; /*padding: 10px 15px;*/ /*border: 1px solid #ddd;*/ From 10f1d020ba0b1f5c0d959847b80b753b6c10fba1 Mon Sep 17 00:00:00 2001 From: Martin Mrose Date: Wed, 25 Mar 2015 00:01:51 +0100 Subject: [PATCH 2/2] Added handling for enlarged chat --- app/js/controllers/hubs.js | 9 +++++++++ app/partials/hubs.html | 26 +++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app/js/controllers/hubs.js b/app/js/controllers/hubs.js index a920f91..80d703c 100644 --- a/app/js/controllers/hubs.js +++ b/app/js/controllers/hubs.js @@ -17,6 +17,15 @@ EiskaltApp.controller('HubsCtrl', function ($scope, EiskaltRPC) { $scope.disconnect = function (huburl) { EiskaltRPC.HubDel(huburl).success(loadHubs); }; + + $scope.enlargedChat = false; + $scope.enlargeChat = function () { + $scope.enlargedChat = true; + }; + + $scope.enlargeUsers = function () { + $scope.enlargedChat = false; + }; }); EiskaltApp.controller('HubCtrl', function ($scope, $interval, $localStorage, settings, EiskaltRPC) { diff --git a/app/partials/hubs.html b/app/partials/hubs.html index 346271e..2c2dcc0 100644 --- a/app/partials/hubs.html +++ b/app/partials/hubs.html @@ -12,10 +12,14 @@
-
    +
      +
    • +
    • + popover-trigger="mouseenter" popover-placement="left" + ng-hide="enlargedChat">
    • -
    • +
    • + +
    • +
    • + +  
    -
    +