From b44794550eb4fc460cdddfca48de210408642363 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 22 Aug 2016 10:20:09 -0400 Subject: #306 - masked ptzcenteredtopbutton as its now part of the list - eases multi-device formatting - so there is no button overlap Former-commit-id: 0f62701947bccceebb859cc733e0f12b84903e06 --- www/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/css/style.css b/www/css/style.css index a7c57347..1dad0bb5 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -312,13 +312,14 @@ http://www.cssportal.com/tryit/index.php?file=blog/css-notification-badge */ } +/* // not using for now, may come in handy later .ptzcenteredtopbutton { position: absolute; top: 20%; left:50%; transform: translate(-50%, -50%); -} +}*/ .ptzcenteredbotbutton { -- cgit v1.2.3 From cadc7089e5bce6e68f0802691d6f5c07e69b888d Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 22 Aug 2016 10:20:53 -0400 Subject: #306 - convert W/S/R buttons to elements of list for easier formatting - no overlaps Former-commit-id: 641f3adb825f3a5dde457416ba417381b54e2322 --- www/js/MonitorModalCtrl.js | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index e51f5af3..cbfa972d 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1052,17 +1052,31 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ .success (function (data) { $scope.isControllable = data.monitor.Monitor.Controllable; + + // *** Only for testing - comment out // + //$scope.isControllable = '1'; // for testing only // $scope.isControllable = 1; $scope.controlid = data.monitor.Monitor.ControlId; - if ($scope.isControllable=='1') + if ($scope.isControllable=='1' ) { + + var apiurl = ZMDataModel.getLogin().apiurl; var myurl = apiurl + "/controls/" + $scope.controlid + ".json"; ZMDataModel.zmDebug("configurePTZ : getting controllable data " + myurl); $http.get(myurl) .success(function (data) { + + // *** Only for testing - comment out - start// + /*data.Control.Control.CanSleep = '1'; + data.Control.Control.CanWake = '1'; + data.Control.Control.CanReset = '1'; + data.Control.Control.CanZoom = '1'; + data.control.Control.HasPresets = '1'; + data.control.Control.HasHomePreset = '1';*/ + // *** Only for testing - comment out - end // if (data.control.Control.CanWake == '1') { @@ -1146,8 +1160,29 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ if (data.control.Control.HasHomePreset == '1') { $scope.ptzPresets.unshift({name:'', icon:"ion-ios-home", cmd:'presetHome'}); + + } + + // lets add these to the end + // strictly speaking, they aren't really presets, but meh for now + + if (data.control.Control.CanWake == '1') + { - $scope.ptzPresetCount++; + $scope.ptzPresets.push({name:'', icon:"ion-eye", cmd:'wake'}); + + } + + if (data.control.Control.CanSleep == '1') + { + $scope.ptzPresets.push({name:'', icon:"ion-eye-disabled", cmd:'sleep'}); + + } + + if (data.control.Control.CanReset == '1') + { + $scope.ptzPresets.push({name:'', icon:"ion-ios-loop-strong", cmd:'reset'}); + } } -- cgit v1.2.3 From b035c235cb7f5d9c08a0c0b96fc145e84b43d002 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 22 Aug 2016 10:21:14 -0400 Subject: #306 - removed Wake/Sleep definitions - they fallback to english if not present anyway Former-commit-id: 769be7321d38ef1f978baebf747e5674b70ba610 --- www/lang/locale-it.json | 2 -- www/lang/locale-pt.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/www/lang/locale-it.json b/www/lang/locale-it.json index fc32e5a9..61a871a3 100644 --- a/www/lang/locale-it.json +++ b/www/lang/locale-it.json @@ -266,7 +266,6 @@ "kShowTip" :"Mostra suggerimenti", "kShowing" :"Visualizzando", "kShowingEvent" :"Mostrando eventi", - "kSleep" :"Sleep", "kSpeed" :"Velocità", "kStart" :"Start", "kStateAreYouSure" :"Sei sicuro di voler ", @@ -306,7 +305,6 @@ "kVersion" :"Versione", "kVersionIncompatible" :"Non sono campatibile con la tua versione di Zoneminder", "kVideo" :"Video", - "kWake" :"Wake", "kWarningLargeTimeline" :"Un valore più alto influenza le prestazioni della timeline. Se le prestazioni sono basse, prova a ridurre il valore a 200.", "kWeek" :"Settimana", "kWelcomeWizard" :"Benvenuto al wizard!!!", diff --git a/www/lang/locale-pt.json b/www/lang/locale-pt.json index 1f635be1..77da2a76 100644 --- a/www/lang/locale-pt.json +++ b/www/lang/locale-pt.json @@ -266,7 +266,6 @@ "kShowTip" :"mostrar dica", "kShowing" :"Mostrando", "kShowingEvent" :"mostrando evento", - "kSleep" :"Sleep", "kSpeed" :"velocidade", "kStart" :"Começar", "kStateAreYouSure" :"Você tem a certeza que quer ", @@ -307,7 +306,6 @@ "kVersionIncompatible" :"Sou incompativel com a sua versão do ZoneMinder", "kVideo" :"Vídeo", "kWarningLargeTimeline" :"Um valor elevado pode afetar o desempenho da timeline. Se você achar o desempenho da timeline lento, tente reduzir o valor para 200 e trabalhe a partir daí.", - "kWake" :"Wake", "kWeek" :"Semana", "kWelcomeWizard" :"Benvindo ao Assistente", "kWizAuthText1" :"Confuso? Autenticação ZM, é a autenticação usada quando você habilita OPT_USE_AUTH no ecrã de opções da consola do ZM.", -- cgit v1.2.3 From 76a3036de85e06f6ee57108c5eae50ad333fef2b Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 22 Aug 2016 10:21:33 -0400 Subject: #306 - removed top template buttons Former-commit-id: a474daa00e82f5cc6014c6444c36bce7771fe291 --- www/templates/monitors-modal.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 9524b041..7ae733e8 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -37,11 +37,7 @@
-
- {{'kWake' | translate}} - {{'kSleep' | translate}} - {{'Reset' | translate}} -
+
-- cgit v1.2.3