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/timeline-modal.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

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