From af74ef969c3cf21e78ee2e93e2956a8812512fe9 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Thu, 18 Feb 2016 16:12:42 -0500
Subject: #164 - initial fixes and refactoring

Former-commit-id: 5a21c98c22d8035454cf92eb7b7a4a2b65a4f0e3
---
 www/templates/devoptions.html     |  8 +++++++-
 www/templates/events-modal.html   | 40 ++++++++++++++++++++++++++-------------
 www/templates/events.html         |  4 ++--
 www/templates/monitors-modal.html |  2 +-
 4 files changed, 37 insertions(+), 17 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 27c5fe23..2ae803fb 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -35,7 +35,13 @@
             <label>
                 <ion-toggle ng-model="loginData.useNphZms"
                             ng-checked="{{loginData.useNphZms}}"
-                            toggle-class="toggle-calm">use ZMS for single stream</ion-toggle>
+                            toggle-class="toggle-calm">use ZMS for single live view</ion-toggle>
+            </label>
+            
+            <label>
+                <ion-toggle ng-model="loginData.useNphZmsForEvents"
+                            ng-checked="{{loginData.useNphZmsForEvents}}"
+                            toggle-class="toggle-calm">use ZMS for events footage</ion-toggle>
             </label>
             
             <div class="item item-input-inset">
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index f51ec86e..df2e3cbe 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -1,4 +1,4 @@
-<div ng-controller="ModalCtrl" ng-cloak>
+    <div ng-controller="EventModalCtrl">
     <!-- style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"-->
     <ion-modal-view cache-view="false">
         <ion-content style="background-color:#444444" ng-cloak>
@@ -8,19 +8,16 @@
                 <div  id="full-screen-event" style="height: 100vh;">
 
 
-                    <div ng-if="defaultVideo=='' || loginData.enableh264==false">
+                    <div ng-if="(defaultVideo=='' || loginData.enableh264==false) && !loginData.useNphZmsForEvents">
                         
-                        <!--<ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{event.Event.Length/event.Event.Frames}}" rn-carousel-pause-on-hover  rn-platform="{{$root.platformOS}}">-->
-                            
-                            
-<!--Speed:{{eventSpeed}}-->
-<ul rn-carousel  rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{eventSpeed}}" rn-carousel-pause-on-hover  rn-platform="{{$root.platformOS}}" rn-carousel-buffered >
-    
+                        
+                        <ul rn-carousel  rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{eventSpeed}}" rn-carousel-pause-on-hover  rn-platform="{{$root.platformOS}}" rn-carousel-buffered >
+
 
                             <li ng-repeat="slide in slides">
                                 <div ng-if="!animationInProgress">
                                     <img  style="width:100vw; height:100vh" imageonload="finishedLoadingImage($index)" 
-                                         image-spinner-src="{{playbackURL}}/index.php?view=image&rand={{$root.rand}}&path={{relativePath}}{{slide.img}}&scale={{loginData.singleImageQuality}}" 
+                                         image-spinner-src="{{playbackURL}}/index.php?view=image&rand={{$root.rand}}&path={{relativePath}}{{slide.img}}&scale={{loginData.singleImageQuality}}{{$root.authSession}}" 
                                          image-spinner-loader="lines" 
                                          ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" 
                                          
@@ -39,8 +36,20 @@
                             </li>
                         </ul>
                     </div>
+                    
+                    <!-- route via ZMS -->
+                    
+                    <div ng-if="( (defaultVideo=='') || (loginData.enableh264==false)) && (loginData.useNphZmsForEvents==true)">
+                       
+                        <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=single&rate=100&connkey={{connKey}}&scale={{loginData.singleImageQuality}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}"/>
+                          
+                        </div>
+                    </div>
+                    
                     <!-- no default video -->
-
+<!--                    
                     <div ng-if="defaultVideo!==undefined && defaultVideo!='' && loginData.enableh264 == true">
                         <div>
                             <videogular vg-theme="videoObject.config.theme" vg-complete="playbackFinished()">
@@ -62,7 +71,7 @@
                       
                     </div>
                     
-
+-->
                 </div>
                 <!-- 100vh -->
             </ion-scroll>
@@ -102,7 +111,7 @@
 </nav>
     
 
-<div class="events-range-modal" ng-if="defaultVideo==''">
+<div class="events-range-modal" ng-if="(defaultVideo=='' )&& (!loginData.useNphZmsForEvents)">
 
     <div style="width:90%">
         <input ng-model="ionRange.index" type="text" id="mySlider2" slider options="slider_modal_options" />
@@ -110,6 +119,11 @@
 
 
 </div>
+        
+<div class="events-range-modal" ng-if="(defaultVideo=='' )&& (loginData.useNphZmsForEvents)" style="color:white">
+   <!-- Progress: Event: {{eventId}} - {{progressText}}-->
+    <progress max="{{currentEventDuration}}" value="{{currentProgress}}"></progress>
+</div>
 
 <div class="events-range-modal-text" >showing event: {{eventId}}</div>
 
@@ -154,4 +168,4 @@
     <progress max="{{totalEventTime}}" value="{{currentEventTime}}"
               class="eventprogress"></progress>
 -->
-    </div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/www/templates/events.html b/www/templates/events.html
index 02254bce..41e29ee4 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -1,4 +1,4 @@
-<div ng-controller="ModalCtrl">
+<!--<div ng-controller="EventModalCtrl">-->
 <ion-view cache-view="false">
     <ion-nav-title>{{scrollPosition();}}</ion-nav-title>
     <ion-nav-buttons side="left">
@@ -327,4 +327,4 @@
 
 
 </ion-view>
-</div>
\ No newline at end of file
+<!--</div>-->
\ No newline at end of file
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index cadd856c..92330d15 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -1,4 +1,4 @@
-<div ng-controller="ModalCtrl" ng-cloak>
+<div ng-controller="MonitorModalCtrl" ng-cloak>
 
     <!--style="background-color:#444444;width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"-->
 
-- 
cgit v1.2.3