From 89211bbbd526bbc587361085b119a19d296f6a7f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 20 Oct 2018 19:17:21 -0400
Subject: #724 cleanup and making sure we take recordingURL for playback

---
 www/templates/events.html         | 4 ++--
 www/templates/moment.html         | 2 +-
 www/templates/monitors.html       | 2 ++
 www/templates/timeline-modal.html | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index b312a79c..71522fa0 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -152,13 +152,13 @@
                   <span ng-repeat="alarm in alarm_images | selectFrames: typeOfFrames">
 
                     <figure class="animated slideInLeft" style="display:inline-block">
-                      <!--{{event.Event.baseURL}} p:{{event.Event.imageMode}}-->
+                      <!--{{event.Event.recordingURL}} 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-src="{{constructAlarmFrame(event,alarm,true)}}" fallback-src="{{constructAlarmFrame(event,alarm,false)}}"
-                        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)" />
+                        style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.recordingURL, alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)" />
 
 
                     </figure>
diff --git a/www/templates/moment.html b/www/templates/moment.html
index 45cdbd13..0f0f55c4 100644
--- a/www/templates/moment.html
+++ b/www/templates/moment.html
@@ -113,7 +113,7 @@
             ng-click="togglePin(moment.Event.Id)"></button>
 
         </div>
-        <!--on-tap="showThumbnail(moment.Event.baseURL,moment.Event.MaxScoreFrameId)"-->
+        
         <figcaption ng-if="showIcons" class="normal-figcaption">&nbsp;{{moment.Event.humanizeTime}}
           <span style="float:right">{{hourmin(moment.Event.StartTime)}}&nbsp;</span>
         </figcaption>
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index fbd1ce26..8daf6fa8 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -48,6 +48,8 @@
           <br /> {{'kStatus' | translate}}: {{monitor.Monitor.isRunningText}}
           <br /> {{'kId' | translate}}: {{monitor.Monitor.Id}}
           <br /> {{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}}
+          <br />Streaming URL: {{monitor.Monitor.streamingURL}}
+          <br />Portal URL: {{monitor.Monitor.baseURL}}
           <br />
           <br />
         </p>
diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html
index 3ae0aba7..5b6c8694 100644
--- a/www/templates/timeline-modal.html
+++ b/www/templates/timeline-modal.html
@@ -27,7 +27,7 @@
           <figure style="display:inline-block">
             <figcaption class="smallnote">f:{{alarm.fid}} scr:{{alarm.score}} @ {{alarm.time}}</figcaption>
             <img image-spinner-src="{{constructFrames(event,alarm)}}" style="width: auto; height: auto;max-width: 100%;max-height: 170px"
-              on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.fid, event.Event.Id, event.Event.imageMode, alarm.id)"
+              on-tap="showImage(event.Event.recordingURL,event.Event.relativePath,alarm.fname, alarm.fid, event.Event.Id, event.Event.imageMode, alarm.id)"
               image-spinner-loader="lines" />
 
 
-- 
cgit v1.2.3