summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-01-27 11:05:43 -0500
committerpliablepixels <pliablepixels@gmail.com>2016-01-27 11:05:43 -0500
commitfd1598f4515777275d58b1d14cce8b75961accd7 (patch)
tree23d5b1930f2b88c1c43d88a4c3f936175a93085d
parent48bbc1932503d9134f483354a2ead029df03a36c (diff)
#155 - more tweaks
Former-commit-id: aefc881b473dd5026acdd2d2e067cf75b8437a98
-rw-r--r--www/templates/montage-history.html10
1 files changed, 7 insertions, 3 deletions
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index d895457a..99c61e94 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -73,7 +73,7 @@
<div ng-if="!isModalActive">
<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="{{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;"
@@ -84,11 +84,15 @@
</div>
<div ng-if = "!minimal && monitor.eventUrl != 'img/noevent.png'">
- <img id="img-$index" image-spinner-src="{{monitor.eventUrl}}&scale={{LoginData.singleImageQuality}}{{$root.authSession}}&rand={{$root.rand}}&rate={{sliderVal.realRate}}" 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}}" image-spinner-loader="lines" style="
width: 100% !important;
height: auto !important;" />
- <div style="position:absolute; bottom:0%; right:0%;white-space:nowrap;overflow:hidden;"
+ <img ng-if="isBackground()" id="img-$index" image-spinner-src="" image-spinner-loader="lines" style="
+ width: 100% !important;
+ height: auto !important;" />
+
+ <div ng-if="!isBackground()" style="position:absolute; bottom:0%; right:0%;white-space:nowrap;overflow:hidden;"
class="header">
&nbsp;<i class="ion-monitor"></i>
{{monitor.Monitor.Name}}&nbsp;