From 403bd587abc92395f9245c2de1adf72197179167 Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Mon, 26 Oct 2015 16:24:16 -0400
Subject: normalized how save works - except no auto save for login

---
 www/templates/devoptions.html          | 10 ++++++----
 www/templates/eventserversettings.html |  7 +++++--
 www/templates/login.html               |  8 +++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 5b1d2936..78c5dbbb 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -1,10 +1,14 @@
-<ion-view view-title="Developer Settings">
+<ion-view view-title="Dev. Settings">
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></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">
+        <button class="button button-clear" ng-click="saveDevOptions()">Save</button>
+    </ion-nav-buttons>
 
 
     <ion-content class="padding">
@@ -59,9 +63,7 @@
                         toggle-class="toggle-calm">Persist hidden monitors</ion-toggle>
             </label>
 
-            <button class="button button-block button-balanced icon ion-locked"
-                    ng-click="saveDevOptions()"> Save
-            </button>
+            
         </div>
     </ion-content>
 </ion-view>
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html
index 68e9f1be..65b9affc 100644
--- a/www/templates/eventserversettings.html
+++ b/www/templates/eventserversettings.html
@@ -10,8 +10,11 @@
         <button class="button button-clear" ng-click="saveItems()">Save</button>
     </ion-nav-buttons>
     
-    <ion-content>
-
+    <ion-content padding="true">
+        
+         <div class="list list-inset">
+        Please make sure your ZM settings are configured and saved before you configure the event server
+        </div>
         <ion-checkbox ng-model="check.isUseEventServer">use event server</ion-checkbox>
 
         <label class="item item-input item-floating-label" ng-if="check.isUseEventServer">
diff --git a/www/templates/login.html b/www/templates/login.html
index 8a14981d..df415cd6 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -4,6 +4,10 @@
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></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">
+        <button class="button button-clear" ng-click="saveItems()">Save</button>
+    </ion-nav-buttons>
 
     <ion-content padding="true" >
         <div class="list list-inset">
@@ -88,9 +92,7 @@
             </ion-toggle>
             </label>
         </div>
-        <button class="button button-block button-balanced icon ion-locked"
-                    ng-click="save()"> Save
-        </button>
+        
 
     </ion-content>
 </ion-view>
-- 
cgit v1.2.3