summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-04-18 17:34:56 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-04-18 17:34:56 -0400
commit99cd8bbe82ec968e6f28d24d98f32f96a554d44b (patch)
treed9e895ae351f2b8679ad697a682539755c043052 /www/templates
parenta092da7535099b4a618bbca6faaa4af5b2aa48e4 (diff)
#606 more montage cleanup
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/events-modal.html2
-rw-r--r--www/templates/montage.html2
2 files changed, 3 insertions, 1 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index c838f128..7d59995b 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -11,12 +11,14 @@
<div style="width:100vw; height:100vh;">
<img ng-if="!liveFeedMid" image-spinner-src="{{loginData.streamingurl}}/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&replay={{currentStreamMode}}&rate=100&connkey={{connKey}}&scale={{singleImageQuality}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"
img-spinner-w="1024" img-spinner-h="768"
+ onload="imageLoaded()"
/>
<div ng-if="liveFeedMid">
<img image-spinner-src="{{loginData.streamingurl}}/nph-zms?mode=jpeg&monitor={{liveFeedMid}}&connkey={{connKey}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"
img-spinner-w="1024" img-spinner-h="768"
+ onload="imageLoaded()"
/>
<div class="events-range-modal-text"><span class="events-range-modal-warning-text">{{eventWarning}}</span> </div>
</div>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 4f341c5a..5952ad9e 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -98,7 +98,7 @@
</figure>-->
- <figure class="{{dragBorder}}" ng-if="monitor.Monitor.listDisplay!='noshow'">
+ <figure class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'">
<!--<div ng-if="!isModalActive" >-->
<!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">-->
<div ng-if="$root.authSession!='undefined' && $root.authSession!=''">