From a09333e8b97a5f5c71331ce18777889510aed302 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Tue, 11 Aug 2015 15:47:11 -0400
Subject: API auth tied into ZM auth, enabled client to work in both auth and
 non-auth mode honoring ZM's auth system

---
 www/templates/events-modal.html    |  2 +-
 www/templates/events.html          |  6 +++---
 www/templates/login.html           | 36 ++++++++++++++++++++++--------------
 www/templates/montage.html         | 10 +++++++++-
 www/templates/zm-portal-login.html |  2 +-
 5 files changed, 36 insertions(+), 20 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index d98138d0..2c793e36 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -15,7 +15,7 @@
                     <li ng-repeat="slide in slides">
 
                          <img imageonload="finishedLoadingImage($index)"
-                                         image-spinner-src="{{loginData.url}}/index.php?view=image&&rand={{$root.rand}}&path={{relativePath}}{{slide.img}}"
+                                         image-spinner-src="{{loginData.url}}/index.php?view=image&rand={{$root.rand}}&path={{relativePath}}{{slide.img}}&scale=100"
                                              image-spinner-loader="lines"
                                              ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}"/>
 
diff --git a/www/templates/events.html b/www/templates/events.html
index 424f916a..2d0d7bdc 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -148,9 +148,9 @@
                                 rn-carousel-index="mycarousel.index"
                                 rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover >
                                 <li ng-repeat="slide in slides">
-
-                                     <img imageonload="finishedLoadingImage($index)"
-                                         image-spinner-src="{{loginData.url}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}"
+                                    <!-- Linwood scaling -->
+                                     <img imageonload="finishedLoadingImage($index)"  
+                                         image-spinner-src="{{loginData.url}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380"
                                              image-spinner-loader="lines"
                                              height="190px";/>
                                     <br/>
diff --git a/www/templates/login.html b/www/templates/login.html
index 2178b491..a2aadd20 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -10,20 +10,28 @@
                 <i class="ion-android-home" style="font-size:150%"></i>
                 ZoneMinder Settings
             </span>
+            
+            <div class="item">
+            <ion-checkbox ng-model="auth.isUseAuth">use authentication</ion-checkbox>
+            
+            <div ng-if = "auth.isUseAuth" >
+                
+                <label class="item item-input item-floating-label" >
+                    <span class="input-label">username</span>
+                    <input autocapitalize="none" autocomplete="off"
+                           autocorrect="off" type="text"
+                           placeholder="username"
+                           ng-model="loginData.username">
+                </label>
 
-            <label class="item item-input item-floating-label" >
-                <span class="input-label">username</span>
-                <input autocapitalize="none" autocomplete="off"
-                       autocorrect="off" type="text"
-                       placeholder="username"
-                       ng-model="loginData.username">
-            </label>
-
-            <label class="item item-input item-floating-label" >
-                <span class="input-label">password</span>
-                <input type="password" placeholder="password"
-                       ng-model="loginData.password">
-            </label>
+                <label class="item item-input item-floating-label" >
+                    <span class="input-label">password</span>
+                    <input type="password" placeholder="password"
+                           ng-model="loginData.password">
+                </label>
+            </div>
+                
+                </div>
             <label class="item item-input item-floating-label" >
                 <span class="input-label">ZM portal url</span>
                 <input autocapitalize="none" autocomplete="off"
@@ -63,7 +71,7 @@
             </label>
         </div>
         <button class="button button-block button-balanced icon ion-locked"
-                    ng-click="save()"> Save
+                    ng-click="save()"> Login
         </button>
 
     </ion-content>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 259f6587..df9ea17c 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -41,14 +41,22 @@
                         {{monitor.Monitor.Name}}&nbsp;</header>
                 </span>
                 <article class="main">
+                   
                     <!-- back to ng-src. spinner was not updating when rand changes-->
                     <!-- FIXME: Scale is 50% hardcoded -->
-                    <img image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;"
+                    <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;"
                          ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)"
                          on-hold="onHold($index)"
                          on-release="onRelease($index)"
                          style="display:block;"  image-spinner-loader="lines"
+                         
                          />
+                    
+                    <div id="div-$index" ng-if="showSizeButtons" style= "position:absolute;top:0; left:0; width:100%; height:100%; background-color:red;z-index:100">
+                        HELLO
+                        
+                    </div>
+                    
                 </article>
             </span>
         </div>
diff --git a/www/templates/zm-portal-login.html b/www/templates/zm-portal-login.html
index 041d0bf2..56d2ee2e 100644
--- a/www/templates/zm-portal-login.html
+++ b/www/templates/zm-portal-login.html
@@ -1,4 +1,4 @@
-<ion-view view-title="Portal" style="background-color:#444444">
+<ion-view view-title="" style="background-color:#444444">
     <ion-content style="background-color:#444444">
     </ion-content>
     </ion-view>
\ No newline at end of file
-- 
cgit v1.2.3