#570 - save/reload and monitor masking

3 files changed, 32 insertions, 3 deletions

diff --git a/www/templates/moment-mask.html b/www/templates/moment-mask.html
new file mode 100644
index 00000000..51657b19
--- /dev/null
+++ b/www/templates/moment-mask.html
@@ -0,0 +1,24 @@
+<ion-modal-view cache-view="false" style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;">
+    <ion-header-bar class="bar-stable">
+        <h1 class="title"></h1>
+        <div class="buttons">
+            <button class="button button-icon icon ion-checkmark" ng-click="saveMask()"></button>
+            <button class="button button-icon icon ion-close" ng-click="cancelMask()"></button>
+        </div>
+    </ion-header-bar>
+    <ion-content>
+        <div class="list">
+            <span ng-repeat="item in monitors">
+                    
+                    <a ng-class="{ 'item  item-icon-right' :  item.Monitor.listDisplay == 'show', 'item item-icon-right eye-background-red' : item.Monitor.listDisplay!='show' }"  ng-click="toggleHide($index)" href="" >
+
+                       
+
+                        <i ng-class="{'icon ion-eye':item.Monitor.listDisplay=='show','eye-red icon ion-eye-disabled':item.Monitor.listDisplay!='show'}"> </i><h2><span ng-class="{'eye-red':item.Monitor.listDisplay!='show'}">{{item.Monitor.Name}}</span></h2><p>{{'kId' | translate}}:{{item.Monitor.Id}}, {{'kMode' | translate}}:{{item.Monitor.Function}}</p>
+                       
+                    </a>
+            
+            </span>
+        </div>
+    </ion-content>
+</ion-modal-view>
diff --git a/www/templates/moment-popover.html b/www/templates/moment-popover.html
index caf7a1d3..2da37112 100644
--- a/www/templates/moment-popover.html
+++ b/www/templates/moment-popover.html
@@ -11,7 +11,8 @@
 
 
             <a class="item" ng-href="" ng-click="popover.hide();getMoments('MaxScore');">{{'kMomentMenuByScore' | translate}}</a>
-     
+
+            
         </div>
     </ion-content>
 </ion-popover-view>
diff --git a/www/templates/moment.html b/www/templates/moment.html
index f3041910..b2c8bbac 100644
--- a/www/templates/moment.html
+++ b/www/templates/moment.html
@@ -2,14 +2,18 @@
     <ion-nav-title>{{'kMoment24Heading' | translate}} {{type}}</ion-nav-title>
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
+        <button class="button button-icon button-clear ion-gear-b" ng-click="hideUnhide()"></button>
+
         <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
     </ion-nav-buttons>
 
     <ion-nav-buttons side="right">
 
-            <a  class="button button-icon icon ion-android-more-vertical" ng-click="toggleSubMenu()" ;></a>
+            <a  class="button button-icon icon ion-chevron-down" ng-click="toggleSubMenu()" ;></a>
+
+            <a  class="button button-icon icon ion-android-more-vertical " ng-click="popover.show($event)" ;>&nbsp;&nbsp;&nbsp;</a>
+
 
-            <a  class="button button-icon icon ion-chevron-down" ng-click="popover.show($event)" ;>&nbsp;&nbsp;&nbsp;</a>
             
     </ion-nav-buttons>
     <ion-content class="padding" delegate-handle="moment-delegate" overflow-scroll="false" mouse-wheel-scroll style="background-color:#444444" >