From e337593cc65dac19eeb29fc99b7def02fdbc55ed Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Thu, 5 May 2016 11:45:19 -0400
Subject: #241 - lots of fixes, now switching between fid=XXX and path=YYYY
 mode depending on API version and other muti-server fixes

Former-commit-id: 57ace2fa05175a07a5565c24820f5f56c6cfd2e0
---
 www/templates/events-modal.html   | 29 +----------------------------
 www/templates/events.html         | 17 +++++++++++------
 www/templates/timeline-modal.html |  5 ++++-
 3 files changed, 16 insertions(+), 35 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 10d52311..5631b4b6 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -162,34 +162,7 @@
         <a class="button button-small icon ion-android-notifications button-positive" href="" ng-click="saveEventImageToPhone(true)"></a>
 </span>
 
-<!--
-    <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>
-    </nav>
-
-
-    <nav mfb-menu position="tr" effect="zoomin" label="collapse"
-         active-icon="ion-chevron-up" resting-icon="ion-chevron-down"
-         toggling-method="click">
-        <a mfb-button icon="ion-ios-fastforward" label="fast forward"
-           ng-click="controlEventStream(eventCommands.fastFwd)"></a>
-        <a mfb-button icon="ion-ios-fastforward-outline" label="slow forward"
-           ng-click="controlEventStream(eventCommands.slowFwd)"></a>
-        <a mfb-button icon="ion-ios-rewind" label="fast rewind"
-           ng-click="controlEventStream(eventCommands.fastRev)"></a>
-        <a mfb-button icon="ion-ios-rewind-outline" label="slow rewind"
-           ng-click="controlEventStream(eventCommands.slowRev)"></a>
-    </nav>
-
-    <progress max="{{totalEventTime}}" value="{{currentEventTime}}"
-              class="eventprogress"></progress>
--->
-        
+
         <div class="events-range-modal" ng-if="(defaultVideo=='' )&& (loginData.useNphZmsForEvents)" style="color:white">
    <!-- Progress: Event: {{eventId}} - {{progressText}}-->
     <div class="row">
diff --git a/www/templates/events.html b/www/templates/events.html
index 13083ba0..fc003db3 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -1,4 +1,4 @@
-<div ng-controller="EventModalCtrl">
+
 <ion-view cache-view="false">
     <ion-nav-title>{{scrollPosition();}}</ion-nav-title>
     <ion-nav-buttons side="left">
@@ -150,13 +150,15 @@
                                 <p>scroll <i class="icon ion-arrow-left-c"></i>
                                 <i class="icon ion-arrow-right-c"></i></p>
                                 <ion-scroll direction="x" overflow-scroll="false">
-                                    baseURL {{event.Event.baseURL}}
+                                  
                                         <span ng-repeat="alarm in alarm_images">
                                                  
                                             <figure style="display:inline-block">
                                                 
-                                                <figcaption><p>frame:{{alarm.id}} score:{{alarm.score}}</p></figcaption>       
-                                                  <img  image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.id, event.Event.Id)"/>
+                                                <figcaption><p>frame:{{alarm.frameid}} score:{{alarm.score}}</p></figcaption>       
+                                                  <img ng-if="event.Event.imageMode=='path'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)"/>
+                                                
+                                                <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)"/>
                                                   
                                                 
                                                 </figure>
@@ -194,7 +196,11 @@
                                             <!-- <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> -->
                                             
                                              
-                                            <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/>
+                                            <img ng-if="event.Event.imageMode=='path'" imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/>
+                                            
+                                            <img ng-if="event.Event.imageMode=='fid'" imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{slide.id}}" image-spinner-loader="lines" height="190px" ;/>
+                                            
+                                            
                                             
                                             <br/>
 
@@ -339,4 +345,3 @@
 
 
 </ion-view>
-</div>
\ No newline at end of file
diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html
index 3df31ec0..1584b961 100644
--- a/www/templates/timeline-modal.html
+++ b/www/templates/timeline-modal.html
@@ -35,7 +35,10 @@
                                 
                             <figure style="display:inline-block">
                                 <figcaption><small>f:{{alarm.fid}} scr:{{alarm.score}} @ {{alarm.time}}</small></figcaption>       
-                                  <img  image-spinner-src="{{playbackURL}}/index.php?view=image&path={{alarm.relativePath}}{{alarm.fname}}&height=380"    style="width: auto; height: auto;max-width: 100%;max-height: 170px;"  on-tap="showImage(playbackURL,alarm.relativePath,alarm.fname, alarm.fid)"/>
+                                <img ng-if="event.Event.imageMode=='path'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)"/>
+                                                
+                                <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)"/>
+                                                  
 
 
                                 </figure>
-- 
cgit v1.2.3