From b9f387782bf9ea222d52eac954f1bddad8131391 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Fri, 28 Aug 2015 11:52:59 -0400
Subject: Implemented auth key into the app so each image refresh in Montage
 and Monitor view does not hit the ZM DB and generate a million records.
 Solves the log pings of https://github.com/pliablepixels/zmNinja/issues/26

---
 www/templates/monitors-modal.html | 15 ++++++++++-----
 www/templates/montage.html        | 22 +++++++++++++++-------
 2 files changed, 25 insertions(+), 12 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 06a4edc3..1fe642fb 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -11,13 +11,18 @@
                     <!-- android needs this 100vh - otherwise max- does not work -->
 
                     <div style="height: 100vh;" class="main">
-                       
-                        <img imageonload="finishedLoadingImage()"
-                             image-spinner-loader="lines"
-                             image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.modalRand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" />
+                           <div ng-if="$root.authSession!='undefined'">
+                            <img imageonload="finishedLoadingImage()"
+                                 image-spinner-loader="lines"
+                                 image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}{{$root.authSession}}&rand={{$root.modalRand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" />
+                        </div>
+                        <div ng-if="$root.authSession=='undefined'">
+                            <img id="img-$index" ng-src="img/pausevideo.png" style="display:block;" 
+                                 width="{{((devWidth)/(7-monitorSize[$index]))}}px;"/>
+                        </div>
                     </div>
                 </ion-scroll>
-           
+           <!--url: {{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&amp;monitor={{monitorId}}&amp;maxfps={{LoginData.maxFPS}}&amp;{{$root.authSession}}&amp;rand={{$root.modalRand}}-->
         </ion-content>
   
 
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 7a192c54..d0a9d624 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -47,15 +47,23 @@
                     <!-- moving to single so I can rely on rand for reloads -->
                     
                     <div ng-if="!isModalActive">
-                    <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-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 ng-if="$root.authSession!='undefined'">
+                            <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50{{$root.authSession}}&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>
+                        <div ng-if="!$root.authSession=='undefined'">
+                            <img id="img-$index" ng-src="img/pausevideo.png" style="display:block;" 
+                                 width="{{((devWidth)/(7-monitorSize[$index]))}}px;"/>
                         </div>
+                    </div>
                     
+                    <!--url: {{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&amp;monitor={{monitor.Monitor.Id}}&amp;maxfps={{LoginData.maxFPS}}&amp;scale=50&amp;{{$root.authSession}}&amp;rand={{$root.rand}}-->
                         <div ng-if="isModalActive">
                             <img id="img-$index" ng-src="img/pausevideo.png" style="display:block;" width="{{((devWidth)/(7-monitorSize[$index]))}}px;"/>
                         </div>
-- 
cgit v1.2.3