From f53cb76ed1f89607bb8f8c261fa771d733d04b3f Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Fri, 31 Jul 2015 09:21:51 -0400
Subject: modified image access to route through index.php and fixed cookie
 intercept and insert

---
 www/templates/events-modal.html |  9 +++++++--
 www/templates/events.html       | 18 +++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 86f52489..2b0c2abe 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -13,10 +13,15 @@
 
                     <li ng-repeat="slide in slides">
 
-                            <img id="hello" imageonload="finishedLoadingImage($index)"
+                         <img imageonload="finishedLoadingImage($index)"
+                                         image-spinner-src="{{loginData.url}}/index.php?view=image&path={{relativePath}}{{slide.img}}"
+                                             image-spinner-loader="lines"
+                                             ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}"/>
+
+                            <!--<img id="hello" imageonload="finishedLoadingImage($index)"
                                 image-spinner-src="{{eventBasePath}}{{slide.img}}?rand={{rand}}"
                                 image-spinner-loader="lines"
-                                ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}";/>
+                                ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}";/>-->
 
                     </li>
                 </ul>
diff --git a/www/templates/events.html b/www/templates/events.html
index 547305ec..efd6cfd3 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -94,7 +94,7 @@
 
 
                         <button class="button button-small icon icon-left ion-ios-eye"
-                                ng-click="closeIfOpen(event);openModal(event.Event.Id, event.Event.Name, event.Event.Length,event.Event.Frames, event.Event.BasePath)" > View Footage
+                                ng-click="closeIfOpen(event);openModal(event.Event.Id, event.Event.Name, event.Event.Length,event.Event.Frames, event.Event.BasePath, event.Event.relativePath)" > View Footage
                     </button>
                     </span>
 
@@ -133,10 +133,22 @@
                                 rn-carousel-index="mycarousel.index"
                                 rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover >
                                 <li ng-repeat="slide in slides">
-                                        <img imageonload="finishedLoadingImage($index)"
-                                         image-spinner-src="{{event.Event.BasePath}}{{slide.img}}?rand={{rand}}"
+
+                                     <img imageonload="finishedLoadingImage($index)"
+                                         image-spinner-src="{{loginData.url}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}"
                                              image-spinner-loader="lines"
                                              height="190px";/>
+                                    <br/>
+
+
+                                     <!-- <img image-spinner-src="{{loginData.url}}cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&scale=100&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}" height="190px;"
+                           image-spinner-loader="lines"
+                         />-->
+
+                                        <!--<img imageonload="finishedLoadingImage($index)"
+                                         image-spinner-src="{{event.Event.BasePath}}{{slide.img}}?rand={{rand}}"
+                                             image-spinner-loader="lines"
+                                             height="190px";/>-->
 
                                 </li>
                             </ul>
-- 
cgit v1.2.3