From ad49ce46fdd6c3d245302575de8fede0995d4069 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 30 Dec 2016 13:42:28 -0500
Subject: initial support - motion shows in alarm frames, falls back to no
 motion frames if analysis images are not found. Scrub and playback don't show
 motion outlines (yet) #417

---
 www/templates/events.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index cb6809f3..a14452bc 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -121,6 +121,10 @@
                         <button ng-click="toggleTypeOfAlarms()" class="button button-small button-assertive button-outline">
                             <span translate="kType"></span>:{{typeOfFrames}}
                         </button>
+                        <button 
+                         ng-click="toggleMotionOutline()" class="button button-small button-assertive button-outline">
+                            <span translate="kOutlineMotion"></span>:{{outlineMotion}}
+                        </button>
                     </p>
                     <ion-scroll direction="x" overflow-scroll="false">
                         <span ng-repeat="alarm in alarm_images | selectFrames: typeOfFrames">
@@ -128,8 +132,9 @@
                                             <figure  class = "animated slideInLeft" style="display:inline-block">
                                                 <!--{{event.Event.baseURL}} p:{{event.Event.imageMode}}-->
                                                 <figcaption class="smallnote"><span translate="kFrame"></span>:{{alarm.frameid}},<span translate="kScore"></span>:{{alarm.score}}, <span translate="kTime"></span>: {{prettifyTimeSec(alarm.time)}}</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, alarm_images, $index)" />
-                        <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, alarm_images, $index)" />
+                        <img ng-if="event.Event.imageMode=='path'" ng-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{outlineMotion? alarm.aname:alarm.fname}}&height=380" fallback-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, alarm_images, $index)" />
+
+                        <img ng-if="event.Event.imageMode=='fid'" ng-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}{{outlineMotionParam}}" fallback-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, alarm_images, $index)" />
                         </figure>
                         </span>
                     </ion-scroll>
-- 
cgit v1.2.3