From 29b1c060760d77cc2b49829f615e1442698f2980 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Sat, 6 Jun 2015 18:14:07 -0400
Subject: added a full screen option for montage view too - no status bars and
 sliders

---
 www/templates/events-graphs.html | 16 +++++--------
 www/templates/montage.html       | 51 ++++++++++++++++++++++++++++------------
 2 files changed, 42 insertions(+), 25 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-graphs.html b/www/templates/events-graphs.html
index 268d5e9a..3f3c2305 100644
--- a/www/templates/events-graphs.html
+++ b/www/templates/events-graphs.html
@@ -7,16 +7,12 @@
     <!-- I'm calling the same controller function but with different parameters when
             you switch between tabs -->
     <ion-tabs class="tabs-icon-top tabs-stable">
-        <ion-tab title="All" icon="ion-stats-bars" on-select="generateTCChart(0,'All Events',0)">
+        <ion-tab title="All" icon="ion-stats-bars" on-select="generateTCChart(0,'All Events',0)" >
             <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" ng-click="handleChartClick($event)" chart="chart1">
                         </canvas>
-                    </div>
+
 
                 </ion-content>
             </ion-nav-view>
@@ -35,7 +31,7 @@
 
 
                     <div style="overflow:scroll;">
-                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" >
+                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options"  ng-click="handleChartClick($event)" chart="chart2">
                         </canvas>
                     </div>
                         </canvas>
@@ -53,7 +49,7 @@
                 <ion-content>
                     <span></span>
                     <div style="overflow:scroll;">
-                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" >
+                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" chart="chart3" ng-click="handleChartClick($event)">
                         </canvas>
                     </div>
 
@@ -68,7 +64,7 @@
                     <!--
                     <div google-chart chart="chartObject[3]"></div>-->
                      <div style="overflow:scroll;">
-                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" >
+                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" chart="chart4" ng-click="handleChartClick($event)">
                         </canvas>
                     </div>
                 </ion-content>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 63f9b144..328b36c7 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -1,9 +1,9 @@
-<ion-view title="Montage View" class="bar-stable" cache-view="false">
+<ion-view title="Montage View" class="bar-stable" cache-view="false" hide-nav-bar="{{minimal}}">
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
     </ion-nav-buttons>
 
-      <ion-nav-buttons side="right">
+    <ion-nav-buttons side="right">
         <button class="button button-icon button-clear ion-android-contract" ng-click="switchMinimal()"></button>
     </ion-nav-buttons>
 
@@ -11,6 +11,8 @@
 
         <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
         <!-- Hi:ROOT: {{montageSize}} LOCAL {{slider.monsize}} -->
+
+        <span ng-if="!minimal">
         <div class=" range range-positive">
             <i class="icon ion-arrow-shrink"></i>
 
@@ -18,33 +20,35 @@
             <i class="icon ion-arrow-expand"></i>
 
         </div>
+        </span>
         <!-- Hi:{{slider.monsize}} {{devWidth}} -->
+
         <div class="wrapper">
 
+
             <span ng-repeat="monitor in monitors| limitTo: monLimit">
-           
-      <span ng-if="!minimal">
-           <header class="header">&nbsp;<i class="ion-monitor"></i> {{monitor.Monitor.Name}}&nbsp;</header>
+              <span ng-if="!minimal">
+                   <header class="header">&nbsp;<i class="ion-monitor"></i> {{monitor.Monitor.Name}}&nbsp;</header>
                 </span>
-               <article class="main">
+            <article class="main">
                 <!-- does not route via APIs. As of today, there is no way to do this via apis.
                  FIXME: I should probably not pass username and password here - instead go the http interceptor
                  and auth token mode -->
                 <div ng-if="!isSimulated()">
 
                     <!-- FIXME: Scale is hard coded to 50 for montage to save resources. Better way? -->
-                    <img  ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&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)"  />
+                    <img ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&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>
+                </div>
 
-                   <div ng-if="isSimulated()">
+                <div ng-if="isSimulated()">
 
-                       <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" ng-click="openModal(monitor.Monitor.Id)">
+                    <img ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" ng-click="openModal(monitor.Monitor.Id)">
 
-                   </div>
-                </article>
+                </div>
+            </article>
 
-    <span ng-if="!minimal">
+            <span ng-if="!minimal">
                <span style="font-size:10px;">
                <footer class="footer">
                   
@@ -55,11 +59,28 @@
                        
                        :{{monitor.Monitor.Function}}
                     </span>
-            </span>
             </footer>
-                </span>
             </span>
+
+            </span>
+            </span>
+            <!-- ng repeat-->
+
+            <div ng-show="minimal">
+                <br/>
+                <button class="button button-outline button-positive" ng-click="switchMinimal()">
+  exit full screen view
+</button>
+
+
+
+            </div>
+
         </div>
+        <!--wrapper-->
+
+
+
     </ion-content>
 
 </ion-view>
-- 
cgit v1.2.3