From 2dca00fc8be172f6bed7bbd8cc9b46093f978bea Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Fri, 5 Feb 2016 09:51:38 -0500
Subject: #126 and #155 - I think I finally got it this time

Former-commit-id: 85587badc26f74e31a1a458ca3bdb3fff016968f
---
 www/templates/monitors-modal.html  | 4 ++--
 www/templates/montage-history.html | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 4ea01df8..f035f6cd 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -17,7 +17,7 @@
 
                         <div ng-if="!animationInProgress && !isBackground() && connKey">
 
-                            <img style="width:100vw; height:100vh" imageonload="finishedLoadingImage()" image-spinner-loader="lines" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode={{currentStreamMode}}&monitor={{monitorId}}{{$root.authSession}}&rand={{$root.modalRand}}&connkey={{connKey}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-swipe-left="onSwipe(monitorId,1)" on-swipe-right="onSwipe(monitorId,-1)" />
+                            <img id="singlemonitor" style="width:100vw; height:100vh" imageonload="finishedLoadingImage()" image-spinner-loader="lines" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode={{currentStreamMode}}&monitor={{monitorId}}{{$root.authSession}}&rand={{$root.modalRand}}&connkey={{connKey}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-swipe-left="onSwipe(monitorId,1)" on-swipe-right="onSwipe(monitorId,-1)" />
 
                         </div>
                         <div ng-if="animationInProgress || isBackground()">
@@ -26,7 +26,7 @@
 
                     </div>
                     <div ng-if="$root.authSession=='undefined'">
-                        <img id="img-$index" ng-src="img/pausevideo.png" style="width:100vw; height:100vh; display:block;" class="object-fit_contain" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" />
+                        <img id="singlemonitor" ng-src="img/pausevideo.png" style="width:100vw; height:100vh; display:block;" class="object-fit_contain" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" />
                     </div>
                 </div>
             </ion-scroll>
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index c1cdd5fa..43ebd35a 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -49,7 +49,7 @@
                      
                     <div ng-if="$root.authSession!='undefined' && !isBackground()">
                         <div ng-if = "!minimal && monitor.eventUrl == 'img/noevent.png' && !sliderVal.hideNoEvents">
-                            <img id="img-$index" image-spinner-src="{{isBackground()?'':monitor.eventUrl}}"  image-spinner-loader="lines" style="
+                            <img id="img-{{$index}}" image-spinner-src="{{isBackground()?'':monitor.eventUrl}}"  image-spinner-loader="lines" style="
                                 width: 100% !important;
                                 height: auto !important;" />
                             <div   style="position:absolute; bottom:0%; right:0%;white-space:nowrap;overflow:hidden;" 
@@ -61,13 +61,13 @@
 
                         <div ng-if = "!minimal && monitor.eventUrl != 'img/noevent.png' && monitor.Monitor.connKey">
 
-                            <img ng-if="!isBackground()" id="img-$index" image-spinner-src="{{monitor.eventUrl}}&scale={{LoginData.singleImageQuality}}{{$root.authSession}}&rand={{$root.rand}}&rate={{sliderVal.realRate}}&connkey={{monitor.Monitor.connKey}}"  image-spinner-loader="lines" style="
+                            <img ng-if="!isBackground()" id="img-{{$index}}" image-spinner-src="{{monitor.eventUrl}}&scale={{LoginData.singleImageQuality}}{{$root.authSession}}&rand={{$root.rand}}&rate={{sliderVal.realRate}}&connkey={{monitor.Monitor.connKey}}"  image-spinner-loader="lines" style="
                             width: 100% !important;
                             height: auto !important;" on-tap="togglePause(monitor.Monitor.Id)" />
                             
                             
 
-                            <img ng-if="isBackground()" id="img-$index" image-spinner-src=""  image-spinner-loader="lines" style="
+                            <img ng-if="isBackground()" id="img-{{$index}}" image-spinner-src=""  image-spinner-loader="lines" style="
                             width: 100% !important;
                             height: auto !important;" />
 
@@ -98,7 +98,7 @@
                     </div> <!-- valid auth session &!background -->
 
                     <div ng-if="!$root.authSession=='undefined' || isBackground()">
-                        <img id="img-$index" image-spinner-src="img/pausevideo.png" 
+                        <img id="img-{{$index}}" image-spinner-src="img/pausevideo.png" 
                              style="width: 100% !important;height: auto !important;" />
                     </div>
                 </div>
-- 
cgit v1.2.3