From b328356494410d2b2498c74ca9c54129b3e25e39 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Tue, 3 May 2016 20:19:32 -0400
Subject: #241 - using baseurl of the remote server instead of local server

Former-commit-id: 9fb4be48834421c47788a9aa3f280546e6525612
---
 www/templates/events-modal.html | 2 +-
 www/templates/events.html       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index ac2065d7..10d52311 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -43,7 +43,7 @@
                        
                         <!--<div style="color:white">connkey:{{connKey}}</div>-->
                         <div style="width:100vw; height:100vh" >
-                          <img   image-spinner-src="{{loginData.streamingurl}}/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&replay={{currentStreamMode}}&rate=100&connkey={{connKey}}&scale={{singleImageQuality}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"/>
+                          <img   image-spinner-src="{{event.Event.streamingURL}}/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&replay={{currentStreamMode}}&rate=100&connkey={{connKey}}&scale={{singleImageQuality}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"/>
                           
                             <div  ng-if="isPaused" style="position:absolute; top:50%; left:50%;white-space:nowrap;overflow:hidden;z-index:999"
                              class="header-paused">
diff --git a/www/templates/events.html b/www/templates/events.html
index 1a324d0d..13083ba0 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -150,13 +150,13 @@
                                 <p>scroll <i class="icon ion-arrow-left-c"></i>
                                 <i class="icon ion-arrow-right-c"></i></p>
                                 <ion-scroll direction="x" overflow-scroll="false">
-                                    
+                                    baseURL {{event.Event.baseURL}}
                                         <span ng-repeat="alarm in alarm_images">
                                                  
                                             <figure style="display:inline-block">
                                                 
                                                 <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" on-tap="showImage(playbackURL,event.Event.relativePath,alarm.fname, alarm.id, event.Event.Id)"/>
+                                                  <img  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.id, event.Event.Id)"/>
                                                   
                                                 
                                                 </figure>
@@ -194,7 +194,7 @@
                                             <!-- <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> -->
                                             
                                              
-                                            <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/>
+                                            <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/>
                                             
                                             <br/>
 
-- 
cgit v1.2.3