From a3f1e385fc0f5a99d6d19aa6fc2ebfef65533070 Mon Sep 17 00:00:00 2001
From: ARC <arjunrc@gmail.com>
Date: Wed, 29 Apr 2015 13:32:58 -0400
Subject: added support to refresh image feeds

---
 www/templates/events-modal.html   | 4 +++-
 www/templates/monitors-modal.html | 3 ++-
 www/templates/montage.html        | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index d6eaefb8..69e7c263 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -15,7 +15,7 @@
         <!-- replay can also be gapless -->
         <div ng-if="!isSimulated()">
             <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; ">
-            <img ng-src="{{loginData.url}}/cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}" width="100%" />
+            <img ng-src="{{loginData.url}}/cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" />
             </ion-scroll>
         </div>
 
@@ -41,6 +41,8 @@
     </nav>
 
     <nav mfb-menu position="bl" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click">
+        <a mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView()"></a>
+
         <a mfb-button icon="ion-pause" label="pause" ng-click="controlEventStream(eventCommands.pause)"></a>
 
         <a mfb-button icon="ion-play" label="play" ng-click="controlEventStream(eventCommands.play)"></a>
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index aa9f416c..beab5282 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -16,7 +16,7 @@
 
         <div ng-if="!isSimulated()">
             <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; ">
-            <img ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" />
+            <img ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}"  width="100%" style="background-image:url('http://www.pbase.com/arjunrc/image/159892445/medium.jpg');"/>
             </ion-scroll>
         </div>
 
@@ -28,6 +28,7 @@
 
     </ion-content>
     <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click">
+         <button mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView()"></button>
         <button mfb-button icon="ion-close" label="close" ng-click="closeModal()"></button>
     </nav>
 
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 1812b8cc..f2ba8c78 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -33,9 +33,9 @@
                    </div>
 
                    <div ng-if="isSimulated()">
-                       <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; ">
+
                        <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;">
-                       </ion-scroll>
+
                    </div>
 
                    <!-- <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"   />-->
-- 
cgit v1.2.3