summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-04-14 15:12:20 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-04-14 15:12:20 -0400
commit7e6d5602ad08bc7f0054de92ca82768208c48d6b (patch)
tree343d1b35dc3fdaa51742ae2203fc82398dc5fe4d /www/templates
parent4daf69b94336ee8a89679f285d9e925cbaa43935 (diff)
#611 #606 - many re-auth leaks
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/monitors-modal.html8
-rw-r--r--www/templates/montage.html2
2 files changed, 4 insertions, 6 deletions
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 12d3708c..02b46a37 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -2,9 +2,6 @@
<ion-modal-view cache-view="false" style="background-color:#444444">
<ion-content ng-cloak on-double-tap="closeModal();" scroll="false">
-
-
-
<div id="imagecontainer">
<ion-scroll ng-if="!isZoneEdit" on-scroll="checkZoom()" delegate-handle="imgscroll" has-bouncing=false min-zoom=1 zooming="true"
direction="xy" style="width: 100%;" overflow-scroll="false">
@@ -12,14 +9,15 @@
<!-- -->
<div id="monitorimage" style="height: 100vh;" class="main">
<div ng-if="$root.authSession!='undefined'">
- <div ng-if="!animationInProgress && !isBackground() && connKey">
+ <div ng-if="!animationInProgress">
+
<!--<span style="color:white">{{currentStreamMode}}</span>-->
<img id="singlemonitor" style="width:100vw; height:100vh;" image-spinner-loader="lines" image-spinner-src="{{constructSingleStream()}}"
ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-swipe-left="onSwipe(monitorId,1)"
on-swipe-right="onSwipe(monitorId,-1)" on-double-tap="closeModal();" imageonload="imageLoaded()" />
</div>
- <div ng-if="animationInProgress || isBackground()">
+ <div ng-if="animationInProgress">
<img style="width:100vw; height:100vh" ng-src="img/pausevideo.png" class="object-fit_contain" />
</div>
</div>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index eba049bf..77580f5e 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -116,7 +116,7 @@
<figcaption id="slowpulse" ng-class="monitor.Monitor.isAlarmed==true?'alarmed-figcaption animated infinite flash':'normal-figcaption'" >&nbsp;
- {{monitor.Monitor.connKey}}&nbsp;
+
<span ng-if="monitor.Monitor.isStamp && isDragabillyOn"><i class="animated infinite flash ion-pin"></i>&nbsp;</span><i class="ion-ios-videocam"></i>&nbsp;
{{monitor.Monitor.Name}}&nbsp;<i ng-if="$root.runMode!='lowbw'" style="{{monitor.Monitor.alarmState}}" class="ion-record"></i>&nbsp;