#806 move buttons to left

ZoneMinder · Apr 12, 2019 · 114e289 · 114e289
1 parent 07f8d17
commit 114e289
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git 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
@@ -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;">&nbsp;&nbsp;&nbsp;
             <i class="ion-calendar"></i>&nbsp;&nbsp;{{prettifyTime(event.Event.StartTime)}}&nbsp;{{tzAbbr}}&nbsp;</span>&nbsp;&nbsp;

diff --git 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 />