From a8fe3392481483299bb32eb1583a1f440486c70a Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Thu, 18 Jun 2015 15:02:19 -0400
Subject: Moved Modal Control to its own file

---
 www/templates/events-modal.html | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'www/templates/events-modal.html')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index ca73ae9c..fcd0f8c9 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -11,25 +11,16 @@
         </h1>
     </ion-header-bar> -->
     <ion-content>
+         <div ng-controller="ModalCtrl">
 
         <!-- 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 imageonload="finishedLoadingImage()" ng-src="{{loginData.streamingurl}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps={{loginData.maxFPS}}&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" />
-            </ion-scroll>
-
-
-        </div>
 
-        <div ng-if="isSimulated()">
             <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; ">
-                <img imageonload="finishedLoadingImage()" ng-src="img/demo.gif" width="100%" />
+                <img imageonload="finishedLoadingImage()" ng-src="{{loginData.streamingurl}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps={{loginData.maxFPS}}&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" />
             </ion-scroll>
 
-        </div>
 
-    </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-close" label="exit event view" ng-click="closeModal()"></button>
 
@@ -50,5 +41,6 @@
 
         <a mfb-button icon="ion-play" label="play" ng-click="controlEventStream(eventCommands.play)"></a>
     </nav>
-
+        </div>
+    </ion-content>
 </ion-modal-view>
-- 
cgit v1.2.3