diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-08-22 10:45:18 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-08-22 10:45:18 -0400 |
| commit | 8b15cd3441a75455b82fa5aee69272398c36cc01 (patch) | |
| tree | cfdd4022f7e2ad928e934c981818e418abfcd108 | |
| parent | e98310511e9f227f0a5e28d971f1730a2af2c9c2 (diff) | |
#306 - Allow each button to have a different color, helps function separation
Former-commit-id: 4a6efdfecf575503a2544772afc465966b0ed1c5
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 10 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index cbfa972d..4ea57528 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1152,14 +1152,14 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ $scope.ptzPresets = []; for (var p=0; p<$scope.ptzPresetCount; p++) { - $scope.ptzPresets.push ({name:(p+1).toString(), icon:'', cmd:"presetGoto"+(p+1).toString()}); + $scope.ptzPresets.push ({name:(p+1).toString(), icon:'', cmd:"presetGoto"+(p+1).toString(), style:'button-royal'}); // $scope.ptzPresets[p].name = "Arjun " + p; // console.log ("Name to " + $scope.ptzPresets[p].name); } if (data.control.Control.HasHomePreset == '1') { - $scope.ptzPresets.unshift({name:'', icon:"ion-ios-home", cmd:'presetHome'}); + $scope.ptzPresets.unshift({name:'', icon:"ion-ios-home", cmd:'presetHome' , style:'button-royal'}); } @@ -1169,19 +1169,19 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ if (data.control.Control.CanWake == '1') { - $scope.ptzPresets.push({name:'', icon:"ion-eye", cmd:'wake'}); + $scope.ptzPresets.push({name:'', icon:"ion-eye", cmd:'wake', style:'button-royal button-dark'}); } if (data.control.Control.CanSleep == '1') { - $scope.ptzPresets.push({name:'', icon:"ion-eye-disabled", cmd:'sleep'}); + $scope.ptzPresets.push({name:'', icon:"ion-eye-disabled", cmd:'sleep', style:'button-royal button-dark'}); } if (data.control.Control.CanReset == '1') { - $scope.ptzPresets.push({name:'', icon:"ion-ios-loop-strong", cmd:'reset'}); + $scope.ptzPresets.push({name:'', icon:"ion-ios-loop-strong", cmd:'reset', style:'button-royal button-dark'}); } diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 7ae733e8..f16dba9b 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -46,7 +46,7 @@ <div ng-if="presetOn" class="ptzpresetbuttons animated fadeInDown" id="presetlist"> <div ng-repeat="preset in ptzPresets track by $index"> - <button class="button {{preset.icon}} button-small button-royal" style="float:left;margin-right:10px;margin-bottom:10px;" ng-click="controlPTZ(monitorId, preset.cmd);">{{preset.name}}</button> + <button class="button {{preset.icon}} button-small {{preset.style}}" style="float:left;margin-right:10px;margin-bottom:10px;" ng-click="controlPTZ(monitorId, preset.cmd);">{{preset.name}}</button> </div> </div> |