From 6e83957c0231d48eb9f29d1270806cadef3a3c6d Mon Sep 17 00:00:00 2001
From: ARC <arjunrc@gmail.com>
Date: Mon, 27 Apr 2015 11:23:46 -0400
Subject: added simulation to events footage as well

---
 www/js/EventCtrl.js             | 4 ++++
 www/templates/events-modal.html | 9 ++++++++-
 www/templates/montage.html      | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'www')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 84764f19..3b29af15 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -58,6 +58,10 @@ $scope.openModal = function(eid,ename,edur) {
             $scope.events = myevents;
         });
 
+$scope.isSimulated = function ()
+    {
+        return ZMDataModel.isSimulated();
+    };
 
 
     $scope.doRefresh = function () {
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 522b286e..42159f54 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -10,6 +10,13 @@
         </h1>
     </ion-header-bar>
     <ion-content>
-        <img ng-src="{{loginData.url}}cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&scale=100&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}" width="100%" />
+        <div ng-if="!isSimulated()">
+            <img ng-src="{{loginData.url}}cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&scale=100&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}" width="100%" />
+        </div>
+
+        <div ng-if="isSimulated()">
+            <img ng-src="img/demo.gif" width="100%">
+        </div>
+
     </ion-content>
 </ion-modal-view>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 8ba62f38..434677c6 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -31,7 +31,7 @@
                    </div>
 
                    <div ng-if="isSimulated()">
-                       <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"
+                       <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;">
                    </div>
 
                    <!-- <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"   />-->
-- 
cgit v1.2.3