diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-13 15:45:33 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-13 15:45:33 -0500 |
| commit | 07a0c77c39c2813748c276750083fed9ad9c0bb8 (patch) | |
| tree | 54c745858628e626e0466256f67f62844f463a05 /www/templates/montage.html | |
| parent | 6e91a956d4d069f15385663ca5e21dc6d391fc88 (diff) | |
#82 - added code to make it work with push mode - requires upgrade to event server
Former-commit-id: 5a3ffdcbe3c43dae25185604e7f47e7899d8f73a
Diffstat (limited to 'www/templates/montage.html')
| -rw-r--r-- | www/templates/montage.html | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html index 87838e76..8039820a 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -22,7 +22,6 @@ </ion-refresher> - <!--{{stateofSlide}} Status--> <span ng-show="!minimal"> <div class="range range-positive"> <i style="color:#bbbbbb" class="icon ion-arrow-shrink"></i> @@ -36,42 +35,37 @@ <div class="wrapper"> <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng-if="monitor.Monitor.Function!='None' && monitor.Monitor.listDisplay!='noshow'"> - <span ng-show="!minimal"> - <div ng-if="monitor.Monitor.isAlarmed=='true'"> - <header class="alarmed-header animated infinite flash"> <i class="ion-monitor"></i> - {{monitor.Monitor.Name}} - </header> - </div> + + <div ng-class="monitor.Monitor.isAlarmed=='true'? 'animated infinite flash':''"> - <div ng-if="monitor.Monitor.isAlarmed!='true'"> - <header class="header"> <i class="ion-monitor"></i> - {{monitor.Monitor.Name}} + <span ng-show="!minimal"> + <header ng-class="monitor.Monitor.isAlarmed=='true'?'alarmed-header':'header'"> <i class="ion-monitor"></i> + {{monitor.Monitor.Name}} </header> - </div> - </span> - <article class="main"> + </span> + + <article class="main"> + + <!-- back to ng-src. spinner was not updating when rand changes--> + <!-- moving to single so I can rely on rand for reloads --> - <!-- back to ng-src. spinner was not updating when rand changes--> - <!-- moving to single so I can rely on rand for reloads --> + <div ng-if="!isModalActive"> + <div ng-if="$root.authSession!='undefined'"> + <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)" style="display:block;" image-spinner-loader="lines" /> - <div ng-if="!isModalActive"> - <div ng-if="$root.authSession!='undefined'"> - <img ng-class="monitor.Monitor.isAlarmed=='true'? 'animated infinite flash':''" id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)" style="display:block;" image-spinner-loader="lines" /> + </div> + + <div ng-if="!$root.authSession=='undefined'"> + <img id="img-$index" ng-src="img/pausevideo.png" style="display:block;" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" /> + </div> </div> - - <div ng-if="!$root.authSession=='undefined'"> + <div ng-if="isModalActive"> <img id="img-$index" ng-src="img/pausevideo.png" style="display:block;" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" /> </div> - - </div> - <div ng-if="isModalActive"> - <img id="img-$index" ng-src="img/pausevideo.png" style="display:block;" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" /> - </div> - - - </article> + </article> + </div> <!-- alarm flash --> </span> <!-- ngrepeat --> </div> <!--wrapper--> |