diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-01-29 14:17:35 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-01-29 14:17:35 -0500 |
| commit | a3090dd2d4af0de8829464874f572e1caed8e76c (patch) | |
| tree | 57834d955742c88aadc4ff1b81366347e16860ce /www/templates/monitors-modal.html | |
| parent | 77bc8857ccaf16c70a68f95f750191b469bf07ff (diff) | |
#154 and #155 various updates, also ties into https://github.com/ZoneMinder/ZoneMinder/issues/1253
Former-commit-id: 7f939b4bad5d9463a7653abbdcafd79d8a6c1fa8
Diffstat (limited to 'www/templates/monitors-modal.html')
| -rw-r--r-- | www/templates/monitors-modal.html | 5 |
1 files changed, 3 insertions, 2 deletions
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> |