From 0e83a778b541591ef468d7ebda1493a000a545e5 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Fri, 26 Jun 2015 11:25:06 -0400
Subject: Added option to keep screen on when viewing footage, also cleaned up
 invocation of cordova plugins when in desktop - it now checks so spurious
 errors don't show in logs

---
 www/templates/login.html   | 9 +++++++--
 www/templates/montage.html | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/login.html b/www/templates/login.html
index e0eb8b33..5c2eff64 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -7,7 +7,7 @@
 
     <ion-content class="padding">
         <div class="list list-inset">
-            <span style="color:rgb(100,100,100)"> <i class="ion-android-home" style="font-size:150%"></i> ZoneMinder portal</span>
+            <span style="color:rgb(100,100,100)"> <i class="ion-android-home" style="font-size:150%"></i> ZoneMinder Settings</span>
             <label class="item item-input">
                 <input autocapitalize="none" type="text" placeholder="Username" ng-model="loginData.username">
             </label>
@@ -22,7 +22,6 @@
                 <input autocapitalize="none" type="text" placeholder="Base path to cgi-bin" ng-model="loginData.streamingurl">
             </label>
 
-            <span style="color:rgb(100,100,100)"><br/><i class="ion-social-angular" style="font-size:150%"></i> ZoneMinder API</span>
             <label class="item item-input">
                 <input autocapitalize="none" type="text" placeholder="ZM Api URL" ng-model="loginData.apiurl">
             </label>
@@ -31,6 +30,12 @@
             <ion-toggle ng-model="loginData.useSSL" ng-checked="{{loginData.useSSL}}" toggle-class="toggle-calm">Use SSL</ion-toggle>
             </label>
 
+             <label >
+
+            <ion-toggle ng-model="loginData.keepAwake" ng-checked="{{loginData.keepAwake}}" toggle-class="toggle-calm">Keep display on<p>(When viewing footage)</p></ion-toggle>
+
+            </label>
+
         </div>
             <button class="button button-block button-balanced icon ion-locked" ng-click="save()"> Save</button>
 
diff --git a/www/templates/montage.html b/www/templates/montage.html
index d1106e2e..7fed7ff3 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -60,5 +60,7 @@
             </div>
         </div>
         <!--ngcontroller -->
+
+
     </ion-content>
 </ion-view>
-- 
cgit v1.2.3