From 277899e84b1c68ededdfb6676898643c43f7fa88 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Sat, 26 Mar 2016 12:04:18 -0400
Subject: #209 - mostly working

Former-commit-id: b686022cd86b5427452583eef2d7a19dd3329177
---
 www/templates/events.html         |  3 +++
 www/templates/timeline-modal.html | 34 ++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index 3cc5f34d..b15afc78 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -143,6 +143,9 @@
                                         <span ng-repeat="alarm in alarm_images">
                                                  
                                             <figure style="display:inline-block">
+                                                <small>
+                                                {{playbackURL}}/index.php?view=image&amp;path={{event.Event.relativePath}}{{alarm.fname}}&amp;height=380"  
+                                                </small>
                                                 <figcaption><p>frame:{{alarm.id}} score:{{alarm.score}}</p></figcaption>       
                                                   <img  image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" />
                                                   
diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html
index fd4cd568..2df0ea89 100644
--- a/www/templates/timeline-modal.html
+++ b/www/templates/timeline-modal.html
@@ -1,16 +1,38 @@
-<div ng-controller="TimelineModalCtrl">
+
+
     <!-- style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"-->
     <ion-modal-view cache-view="false">
         <ion-content  ng-cloak on-double-tap="closeModal()">
-         
-              <div id="timeline-alarm-vis"></div>
+<div ng-controller="TimelineModalCtrl">   
+            <center><h5> Showing frames for Event: {{eid}}</h5></center>
+               
+              <div id="timeline-alarm-vis" ></div>
                 
-         
-         
+              <ion-spinner icon="spiral" style="position:absolute; top:50%;left:50%" ng-if="!dataReady"></ion-spinner>     
+    
+            <div style="height:190px;">
+                <ion-scroll direction="x" >
+
+                    
+                        <span ng-repeat="alarm in alarm_images">
+                               
+                                
+                            <figure style="display:inline-block">
+                                <figcaption><small>frame:{{alarm.fid}} score:{{alarm.score}}</small></figcaption>       
+                                  <img  ng-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)"/>
+
+
+                                </figure>
+
+                        </span>
+
+                </ion-scroll>
+            </div>
+         </div>
         </ion-content>
         
     </ion-modal-view>
 
 
 
-</div>
\ No newline at end of file
+
-- 
cgit v1.2.3