From 07a0c77c39c2813748c276750083fed9ad9c0bb8 Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Fri, 13 Nov 2015 15:45:33 -0500
Subject: #82 - added code to make it work with push mode - requires upgrade to
 event server

Former-commit-id: 5a3ffdcbe3c43dae25185604e7f47e7899d8f73a
---
 www/templates/montage.html | 50 ++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

(limited to 'www/templates')

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">&nbsp;<i class="ion-monitor"></i>
-                            {{monitor.Monitor.Name}}&nbsp;
-                        </header>
-                    </div>
+                
+                <div ng-class="monitor.Monitor.isAlarmed=='true'? 'animated infinite flash':''">
                     
-                    <div ng-if="monitor.Monitor.isAlarmed!='true'">
-                        <header class="header">&nbsp;<i class="ion-monitor"></i>
-                            {{monitor.Monitor.Name}}&nbsp;
+                    <span ng-show="!minimal">
+                        <header ng-class="monitor.Monitor.isAlarmed=='true'?'alarmed-header':'header'">&nbsp;<i class="ion-monitor"></i>
+                                {{monitor.Monitor.Name}}&nbsp;
                         </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-->
-- 
cgit v1.2.3