diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-04-26 08:07:24 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-04-26 08:07:24 -0400 |
| commit | 75d3f107e7db8c1c0a04cbdd1de33f03d717c24d (patch) | |
| tree | 151d91e637b7924c7e0c553a8a90688107a4cd0e /www | |
| parent | 3cabfd5f50ae037d5af813655dc5e3e7b1d981a8 (diff) | |
#517 - put presets in a scrollable container
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 1 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index e7567170..01169130 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1587,6 +1587,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ //$scope.presetAndControl = $translate.instant('kPresets'); $scope.ptzPresetCount = parseInt(data.control.Control.NumPresets); + //$scope.ptzPresetCount =80; NVRDataModel.debug("ConfigurePTZ Number of presets is " + $scope.ptzPresetCount); diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 746b6232..45b3a9d1 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -67,9 +67,11 @@ </circular> </div> <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 {{preset.style}}" style="float:left;margin-right:10px;margin-bottom:10px;" ng-click="controlPTZ(monitorId, preset.cmd);">{{preset.name}}</button> - </div> + <ion-scroll style="height:170px"> + <div ng-repeat="preset in ptzPresets track by $index"> + <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> + </ion-scroll> </div> <div class="ptzcenteredbotbutton"> <div ng-if="canZoom"> |