summaryrefslogtreecommitdiff
path: root/www/templates/montage.html
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-08-19 15:12:58 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-08-19 15:12:58 -0400
commitd2b35b896c5960b27047321769186b32819e9a0b (patch)
tree92172015955f95e3db1e139f647a943acc60ec6e /www/templates/montage.html
parent9f0172691266b92b5204e440c0b31188f0eeb4ac (diff)
Fixed monitor view and montage performance - nph-zms instances were building up at the server killing it after repeated use. phew
Diffstat (limited to 'www/templates/montage.html')
-rw-r--r--www/templates/montage.html9
1 files changed, 8 insertions, 1 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html
index fa95234f..c3ad91e5 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -45,13 +45,20 @@
<!-- back to ng-src. spinner was not updating when rand changes-->
<!-- FIXME: Scale is 50% hardcoded -->
<!-- moving to single so I can rely on rand for reloads -->
- <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;"
+
+ <div ng-if="!isModalActive">
+ <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;"
ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)"
on-hold="onHold($index)"
on-release="onRelease($index)"
style="display:block;" image-spinner-loader="lines"
/>
+ </div>
+
+ <div ng-if="isModalActive">
+ <img id="img-$index" ng-src="img/novideo.png" style="display:block;" width="{{((devWidth)/(7-monitorSize[$index]))}}px;"/>
+ </div>