From c4fa763b5b365012756cc86024982232984904c7 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Sun, 24 May 2015 16:16:28 -0400
Subject: added PTZ support (well, P for now, but framework with a cool menu is
 in place)

---
 www/templates/events-graphs.html  |  7 ++++++-
 www/templates/events-modal.html   |  2 +-
 www/templates/events.html         | 40 ++++++++++++++++++++++++++++++++++-----
 www/templates/monitors-modal.html | 26 ++++++++++++++++++++++---
 www/templates/monitors.html       |  2 +-
 www/templates/montage.html        |  2 +-
 6 files changed, 67 insertions(+), 12 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-graphs.html b/www/templates/events-graphs.html
index fe2a6326..268d5e9a 100644
--- a/www/templates/events-graphs.html
+++ b/www/templates/events-graphs.html
@@ -11,8 +11,10 @@
             <ion-nav-view>
                 <ion-content class="has-header">
 
+
+
             <div style="overflow:scroll;">
-                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" >
+                        <canvas tc-chartjs-bar chart-data="data" chart-options="options" >
                         </canvas>
                     </div>
 
@@ -29,6 +31,9 @@
                 <ion-content>
                     <span></span>
 
+
+
+
                     <div style="overflow:scroll;">
                         <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" >
                         </canvas>
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index f53de46e..4cb76867 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -31,7 +31,7 @@
 
     </ion-content>
     <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click">
-        <button mfb-button icon="ion-close" label="close" ng-click="closeModal()"></button>
+        <button mfb-button icon="ion-close" label="exit event view" ng-click="closeModal()"></button>
 
 
         <a mfb-button icon="ion-skip-backward" label="previous" ng-click="controlEventStream(eventCommands.previous)"></a>
diff --git a/www/templates/events.html b/www/templates/events.html
index a2ae5a2e..f2df166f 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -1,5 +1,5 @@
-<ion-view view-title="{{viewTitle.title}} Events" cache-view="false">
-<ion-nav-title>{{viewTitle.title}} Events</ion-nav-title>
+<ion-view view-title="" cache-view="false">
+<!-- <ion-nav-title>{{viewTitle.title}} Events</ion-nav-title>-->
 
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
@@ -8,18 +8,48 @@
     <ion-nav-buttons side="right">
         <a style="" class="button button-icon icon ion-stats-bars" ng-href="#events-graphs"> </a>
 
+                <a style="" class="button button-icon icon ion-refresh" ng-href="" ng-click="doRefresh();"> </a>
+
+         <a style="" class="button button-icon icon ion-search" ng-href="" ng-click="searchClicked();"> </a>
+
+
+
         <!--<a ui-sref="app.events-graphs" class="item" ng-click="toggleMenu()">Tabs</a>-->
+
     </ion-nav-buttons>
 
 
+   <div ng-if="showSearch">
+   <ion-header-bar class="bar bar-subheader item-input-inset" >
+        <label class="item-input-wrapper" >
+            <i class="icon ion-ios7-search placeholder-icon" ></i>
+            <input  type="search" placeholder="Search" ng-model="search.text" autocorrect="off"  autocomplete="off"  >
 
-    <ion-content>
+        </label>
 
-        <ion-refresher pulling-text="Pull to reload Events..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
+</ion-header-bar>
+    </div>
+
+   <!--
+   <ion-header-bar class="bar-dark bar-subheader" >
+
+    <div class="bar bar-header item-input-inset" >
+  <label class="item-input-wrapper" >
+    <i class="icon ion-ios-search placeholder-icon" ></i>
+    <input type="search" placeholder="Search" ng-model="myfilter" >
+  </label>
+</div>
+ </ion-header-bar>
+  -->
+
+
+    <ion-content on-tap="tapped();">
+        <ion-refresher pulling-text="Tap the <i class='ion-refresh'></i> icon above to reload ..." spinner="bubbles" on-refresh="dummyDoRefresh();" ></ion-refresher>
         <!--<ion-list>-->
         <!-- <div ng-repeat="event in events">-->
 
-        <ion-item collection-repeat="event in events">
+
+        <ion-item collection-repeat="event in events| filter:search.text"  >
 
             <div class="row">
                 <div class="col col-left">
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 8c4da851..f21beae4 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -17,7 +17,9 @@
         <div ng-if="!isSimulated()">
             <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; ">
 
-                <img  imageonload="finishedLoadingImage()" ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" />
+                <img imageonload="finishedLoadingImage()" ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" />
+
+                <!-- <img  imageonload="finishedLoadingImage()" ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps=3&buffer=1000&rand={{rand}}" width="100%" />-->
             </ion-scroll>
         </div>
 
@@ -28,11 +30,29 @@
         </div>
 
     </ion-content>
+
+    <!--
+ <div ng-if="isControllable=='1'">
+    <nav mfb-menu position="bl" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click">
+        <button mfb-button icon="ion-android-arrow-dropleft-circle" label="left" ng-click="controlPTZ('Left',monitorId)"></button>
+        <button mfb-button icon="ion-android-arrow-dropright-circle" label="right" ng-click="controlPTZ('Right',monitorId)"></button>
+    </nav>
+
+</div>-->
+
     <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click">
         <button mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView()"></button>
-        <button mfb-button icon="ion-close" label="close" ng-click="closeModal()"></button>
-    </nav>
 
+        <button mfb-button icon="ion-arrow-expand" label="pan/tilt/zoom" ng-click="togglePTZ();"></button>
+
+        <button mfb-button icon="ion-close" label="exit live view" ng-click="closeModal()"></button>
+    </nav>
 
+    <div ng-show="isControllable=='1' && showPTZ">
+        <div class="ptzcentered">
+            <circular options="radialMenuOptions">
+            </circular>
+        </div>
+    </div>
 
 </ion-modal-view>
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 3916bdb8..6ef5d954 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -42,7 +42,7 @@
                 <div style="float:right;">
                     <a class="button button-small icon icon-left icon ion-gear-a" href="" ng-click="changeConfig(monitor.Monitor.Name, monitor.Monitor.Id,monitor.Monitor.Enabled,monitor.Monitor.Function);">Configuration</a>
                     <a class="button button-small icon icon-left ion-calendar" href="#/events/{{monitor.Monitor.Id}}">Events</a>
-                    <a class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(monitor.Monitor.Id)"  >Live View</a>
+                    <a class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)"  >Live View</a>
                 </div>
 
             </div>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 70b7ca8b..b1141905 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -27,7 +27,7 @@
                  and auth token mode -->
                 <div ng-if="!isSimulated()">
 
-                    <img  ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps=3&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" ng-click="openModal(monitor.Monitor.Id)"  />
+                    <img  ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps=3&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)"  />
 
                    </div>
 
-- 
cgit v1.2.3