From a3090dd2d4af0de8829464874f572e1caed8e76c Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Fri, 29 Jan 2016 14:17:35 -0500
Subject: #154 and #155 various updates, also ties into
 https://github.com/ZoneMinder/ZoneMinder/issues/1253

Former-commit-id: 7f939b4bad5d9463a7653abbdcafd79d8a6c1fa8
---
 www/templates/monitors-modal.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'www/templates/monitors-modal.html')

diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 0aac4bd1..d993ca7b 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -15,9 +15,9 @@
                     <div ng-if="$root.authSession!='undefined'">
 
 
-                        <div ng-if="!animationInProgress && !isBackground()">
+                        <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}}" 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 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()">
@@ -57,6 +57,7 @@
         </div>
 
 
+        <button class="button" style="position:absolute;top:50%;left:50%;-index:999" ng-click="killThis()">KILL</button>
         
 
     </ion-modal-view>
-- 
cgit v1.2.3