From b7ecc30ef6a7781e6681accdabfe63cea7a9e9a2 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Sat, 26 Mar 2016 14:28:08 -0400
Subject: #209 - more fixes

Former-commit-id: ae01def03cfa6198c0a1515590596d3b847964a4
---
 www/templates/events.html         |  4 +---
 www/templates/timeline-modal.html | 13 ++++++-------
 www/templates/timeline.html       |  2 ++
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index b15afc78..51af9d22 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -143,9 +143,7 @@
                                         <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 2df0ea89..0b06a269 100644
--- a/www/templates/timeline-modal.html
+++ b/www/templates/timeline-modal.html
@@ -4,22 +4,21 @@
     <ion-modal-view cache-view="false">
         <ion-content  ng-cloak on-double-tap="closeModal()">
 <div ng-controller="TimelineModalCtrl">   
-            <center><h5> Showing frames for Event: {{eid}}</h5></center>
-               
+            <br/>
+            <center> <h5>Showing for Event: {{eid}} (double-tap to exit)</h5></center>
+               {{errorDetails}}
               <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" >
-
-                    
+                <ion-scroll direction="x"  class="wide-as-needed">
                         <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)"/>
+                                <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)"/>
 
 
                                 </figure>
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index 0a59e5f9..9caf51b2 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -29,6 +29,8 @@
         {{prettify(fromDate)}} - {{prettify(toDate)}} (only displaying last {{maxItems}} events) 
             </div>
 
+        <ion-spinner icon="spiral" style="position:absolute; top:50%;left:50%" ng-if="!graphLoaded"></ion-spinner>  
+        
         <div ng-if="!graphLoaded">
             <br/><br/>
             <center>
-- 
cgit v1.2.3