diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-04-11 20:21:10 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-04-11 20:21:10 -0400 |
| commit | 5013b49627222ee32aaa64e522680d92dd8bfd8a (patch) | |
| tree | 07a4e1e73417b7d2cbf5037e6363993d66dc47fd | |
| parent | 2eadfcf83d4d336c4cc794ca047516d96a62e3f7 (diff) | |
#806 move buttons to left
| -rw-r--r-- | www/js/MontageCtrl.js | 7 | ||||
| -rw-r--r-- | www/templates/events.html | 2 | ||||
| -rw-r--r-- | www/templates/montage.html | 16 |
3 files changed, 17 insertions, 8 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 1a0fcffa..3871d42c 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -2272,6 +2272,13 @@ angular.module('zmApp.controllers') }); + $scope.clearAllEvents = function () { + + for (var i = 0; i < $scope.MontageMonitors.length; i++) { + $scope.eventButtonClicked ($scope.MontageMonitors[i], false); + } + + }; $scope.eventButtonClicked = function (monitor, showEvents) { var ld = NVR.getLogin(); mid = monitor.Monitor.Id; diff --git a/www/templates/events.html b/www/templates/events.html index 62249598..cb75e6c0 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -27,7 +27,7 @@ <!-- lets make sure the events list is not empty as collection repeat needs height --> <div ng-if="!eventsBeingLoaded"> <ion-list show-delete="eventList.showDelete"> - <ion-item force-refresh-images="true" collection-repeat="event in events| filter:search.text | eventListFilter" + <ion-item force-refresh-images="true" collection-repeat="event in events| filter:search.text | eventListFilter" force-refresh-images=true item-height="event.Event.height" id="item-{{$index}}" on-swipe-left="checkSwipe($index);" > <span style="float:left;margin-top:-18px;background-color:#96281B;color:#fff;font-size:11px;opacity:0.7;border-radius: 0px 0px 5px 5px;"> <i class="ion-calendar"></i> {{prettifyTime(event.Event.StartTime)}} {{tzAbbr}} </span> diff --git a/www/templates/montage.html b/www/templates/montage.html index 1d1e980e..3cfe3699 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -58,10 +58,16 @@ </a> </li> + <li> + <a ng-click="clearAllEvents()"> + <i class="ion-checkmark"></i> + </a> + </li> + <li ng-style="{'background-color': isCycleOn()?'rgba(69, 170, 242,0.7)':'rgba(108, 122, 137, 0.7)'}" ng-if="!isDragabillyOn"> <a ng-click="toggleCycle()"> - <i class="ion-android-bicycle"></i>:{{getCycleStatus()}}</a> + <i class="ion-android-bicycle"></i></a> </li> <li ng-if="isDragabillyOn"> @@ -75,11 +81,6 @@ </a> </li> - </ul> - </div> - - <div id="flyoutmenu" style="float:right"> - <ul> <li> <a href="" ng-click="switchMontageProfile()"> <i class="ion-navicon-round"></i> @@ -98,9 +99,10 @@ </a> </li> - </ul> </div> + + <div style="clear: both;"></div> <br /> |