summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-04-11 07:52:01 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-04-11 07:52:01 -0400
commit2cd649ccfb32ad6c5e1148a22bf59cf30ac92e57 (patch)
tree1f1bdabe3cc4566907ee58b22a87b19fb9089d20 /www/templates
parent71946c0f728e16f44b0682745f50217c835932a5 (diff)
#606 proper cleanup
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/montage.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 5abf9b22..1a0b56df 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -33,6 +33,10 @@
<br/>
<div id="flyoutmenu" style="float:left">
<ul>
+ <li>
+ <a href="" ng-click="killAllImages()"> <i class="ion-ionic"></i></a>
+ </li>
+
<li>
<a href="" ng-click="sliderChanged(1)"> <i class="ion-plus-circled"></i></a>
</li>
@@ -99,8 +103,8 @@
<!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">-->
<div ng-if="$root.authSession!='undefined' && !isBackground() ">
<div ng-if = "!minimal" >
-
- <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/nph-zms?mode={{getMode()}}&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{randToAvoidCacheMem}}{{appendConnKey(monitor.Monitor.connKey)}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}" />
+
+ <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{constructStream(monitor)}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}" />
</div>