diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-16 14:52:49 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-16 14:52:49 -0400 |
| commit | a84ed1903f9ebd2d7e0c31543fe90e222126c668 (patch) | |
| tree | d92f6464c764b9eda060bc369ff3cce9d9f0ba2e | |
| parent | 4f2562397da366f01ef8c654fdab3c664fd11d58 (diff) | |
menu option to toggle event summary (iPhoneX ui interference)
| -rw-r--r-- | www/js/EventCtrl.js | 14 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 1 | ||||
| -rw-r--r-- | www/templates/events-popover.html | 5 |
3 files changed, 20 insertions, 0 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index e350f512..b2caf1d5 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1814,11 +1814,25 @@ angular.module('zmApp.controllers') // data for events ranges summaries using the consolveEvents facility of ZM //-------------------------------------------------------------------------- + + $scope.footerToggle = function() { + + if ($scope.footerState == ionPullUpFooterState.EXPANDED) + $scope.footerCollapse(); + else + $scope.footerExpand(); + }; + $scope.footerExpand = function () { + $scope.footerState = ionPullUpFooterState.EXPANDED; footerExpand(); }; + $scope.footerCollapse = function() { + $scope.footerState = ionPullUpFooterState.MINIMIZED; + }; + function footerExpand() { //https://server/zm/api/events/consoleEvents/5%20minute.json var ld = NVRDataModel.getLogin(); diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index b30f2d23..a774e866 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -351,6 +351,7 @@ "kStatus" :"Status", "kStop" :"Stop", "kSuccess" :"Success", + "kToggleSummary" :"toggle summary", "kSwitchingEvents" :"switching events", "kSystemStatus" :"System Status", "kTapEvents" :"Events", diff --git a/www/templates/events-popover.html b/www/templates/events-popover.html index d61f8f5b..2620c9b3 100644 --- a/www/templates/events-popover.html +++ b/www/templates/events-popover.html @@ -11,8 +11,13 @@ </a> <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.enableAlarmCount">{{'kShowAllEvents' | translate}}</a> + <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="!loginData.enableAlarmCount"> {{'kShowAlarmedEvents' | translate}}</a> + + <a class="item" ng-href="" ng-click="popover.hide();footerToggle();" > + {{ 'kToggleSummary' | translate}}</a> + </div> </ion-content> </ion-popover-view> |