diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventModalCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 7 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 9 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 23 |
4 files changed, 34 insertions, 12 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 4b15e997..d899e7e8 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -904,6 +904,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro return; + $scope.isToggleListMenu = true; $scope.videoDynamicTime = ""; $scope.videoIsReady = false; var ld = NVRDataModel.getLogin(); @@ -1175,6 +1176,12 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro }; + $scope.toggleListMenu = function() + { + + $scope.isToggleListMenu = !$scope.isToggleListMenu; + }; + $scope.toggleGapless = function() { // console.log(">>>>>>>>>>>>>>GAPLESS TOGGLE INSIDE MODAL"); diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index 0a18e1c6..a41cb04d 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1413,6 +1413,12 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ }); } + $scope.toggleListMenu = function() + { + + $scope.isToggleListMenu = !$scope.isToggleListMenu; + }; + //------------------------------------------------------------- // Zoom in and out via +- for desktops //------------------------------------------------------------- @@ -1684,6 +1690,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ { $scope.monStatus = ""; + $scope.isToggleListMenu = true; document.addEventListener("pause", onPause, false); document.addEventListener("resume", onResume, false); diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 06ff464e..d01c948d 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -81,13 +81,16 @@ <div class="events-range-modal-text">{{mName}} <i class="ion-arrow-right-b"></i> {{videoDynamicTime}} ({{humanizeTime}}) [{{d_eventId}}] </div> <div id="flyoutmenu" style="position:absolute;bottom:100px;left:10px"> <ul> - <li ng-if="defaultVideo==''"> + <li> + <a href="" ng-click="toggleListMenu()"> <i ng-class="(isToggleListMenu) ? 'icon ion-chevron-left': 'icon ion-chevron-right'"></i></a> + </li> + <li ng-if="defaultVideo=='' && isToggleListMenu"> <a href="" ng-click="toggleGapless()"> <i class="ion-ios-loop-strong"></i>-{{loginData.gapless? ('kOn' | translate): ('kOff' | translate)}}</a> </li> - <li ng-if="defaultVideo==''"> + <li ng-if="defaultVideo=='' && isToggleListMenu"> <a href="" ng-click="saveEventImageToPhoneWithPerms(false)"> <i class="ion-ios-camera"></i></a> </li> - <li ng-if="defaultVideo==''"> + <li ng-if="defaultVideo=='' && isToggleListMenu"> <a href="" ng-click="saveEventImageToPhoneWithPerms(true)"> <i class="ion-android-notifications"></i></a> </li> <li ng-if="$root.isAlarm"> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index a6e93ec6..f5eccca3 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -101,40 +101,45 @@ </nav> <div id="flyoutmenu" style="position:absolute;bottom:80px;left:10px"> <ul> + <li> + <a href="" ng-click="toggleListMenu()"> <i ng-class="(isToggleListMenu) ? 'icon ion-chevron-left': 'icon ion-chevron-right'"></i></a> + </li> + + <li ng-if="isToggleListMenu"> <a href="" ng-click="saveImageToPhoneWithPerms(monitorId)"> <i class="icon ion-ios-camera"></i></a> </li> - <li ng-if="$root.platformOS == 'desktop'"> + <li ng-if="$root.platformOS == 'desktop' && isToggleListMenu"> <a href="" ng-click="zoomImage(1)"><i class="ion-plus-round"></i></a> </li> - <li ng-if="$root.platformOS == 'desktop'"> + <li ng-if="$root.platformOS == 'desktop' && isToggleListMenu"> <a href="" ng-click="zoomImage(-1)"><i class="ion-minus-round"></i></a> </li> - <li> + <li ng-if="isToggleListMenu"> <a href="" ng-click="enableAlarm(monitorId,true)"> <i class="icon ion-flash"></i></a> </li> - <li> + <li ng-if="isToggleListMenu"> <a href="" ng-click="enableAlarm(monitorId,false)"> <i class="icon ion-flash-off"></i></a> </li> - <li> + <li ng-if="isToggleListMenu"> <a href="" ng-click="toggleZone()"> <i class="icon ion-qr-scanner"></i></a> </li> <!-- zone editing is TBD --> - <li ng-if="showZones && 0"> + <li ng-if="showZones && 0 && isToggleListMenu"> <a href="" ng-click="toggleZoneEdit()"> <i class="icon ion-edit"></i></a> </li> - <li ng-if="showZones && isZoneEdit"> + <li ng-if="showZones && isZoneEdit && isToggleListMenu"> <a href="" ng-click="saveZones()"> <i class="icon ion-android-done-all"></i></a> </li> - <li ng-if="showZones && isZoneEdit"> + <li ng-if="showZones && isZoneEdit && isToggleListMenu"> <a href="" ng-click="changeCircleSize()"> <i class="icon ion-navigate"></i></a> </li> - <li> + <li ng-if="isToggleListMenu"> <a href="" ng-click="toggleCycle()"> <i class="icon ion-android-bicycle"></i>-{{cycleText}}</a> </li> |