From d442629aa825aab6bc55ab6be19e3aba060867fe Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Sun, 21 Jun 2015 18:05:01 -0400
Subject: remove simulation code completely to keep things easy to understand.

---
 www/templates/devoptions.html     |  9 +---
 www/templates/events-graphs.html  | 18 ++++----
 www/templates/events-modal.html   | 38 ++++++----------
 www/templates/events.html         | 60 ++++++++-----------------
 www/templates/help.html           | 80 ++++++++++++++++------------------
 www/templates/login.html          |  2 -
 www/templates/monitors-modal.html | 43 +++---------------
 www/templates/monitors.html       | 24 +++++-----
 www/templates/montage.html        | 92 ++++++++++++++++++---------------------
 www/templates/state.html          |  2 +-
 10 files changed, 141 insertions(+), 227 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 4930c3e8..7b5fca0e 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -10,8 +10,6 @@
 
             <span style="color:rgb(100,100,100)"><i class="ion-android-settings" style="font-size:150%"></i> Developer Options</span>
 
-            <!-- <ion-toggle ng-model="loginData.simulationMode" ng-checked={{loginData.simulationMode}} toggle-class="toggle-energized">Simulation Mode</ion-toggle>-->
-
             <div class="item item-input-inset">
 
                 Max Monitors in Montage&nbsp;
@@ -30,17 +28,14 @@
 
             </div>
 
-             <div class="item item-input-inset">
+            <div class="item item-input-inset">
 
                 Montage Streaming Quality(%)&nbsp;
                 <label class="item-input-wrapper">
-                    <input type="tel" placeholder="max is 30" ng-model="loginData.montageQuality">
+                    <input type="tel" placeholder="max is 70" ng-model="loginData.montageQuality">
                 </label>
-
             </div>
 
-
-
             <button class="button button-block button-balanced icon ion-locked" ng-click="saveDevOptions()"> Save</button>
 
 
diff --git a/www/templates/events-graphs.html b/www/templates/events-graphs.html
index 3f3c2305..91b58001 100644
--- a/www/templates/events-graphs.html
+++ b/www/templates/events-graphs.html
@@ -7,11 +7,11 @@
     <!-- 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">
-                        <canvas tc-chartjs-bar chart-data="data" chart-options="options" ng-click="handleChartClick($event)" chart="chart1">
-                        </canvas>
+                    <canvas tc-chartjs-bar chart-data="data" chart-options="options" ng-click="handleChartClick($event)" chart="chart1">
+                    </canvas>
 
 
                 </ion-content>
@@ -31,12 +31,12 @@
 
 
                     <div style="overflow:scroll;">
-                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options"  ng-click="handleChartClick($event)" chart="chart2">
+                        <canvas tc-chartjs-bar chart-data="data" chart-options="options" ng-click="handleChartClick($event)" chart="chart2">
                         </canvas>
                     </div>
-                        </canvas>
+                    </canvas>
 
-                        <!-- <div google-chart chart="chartObject[1]"></div>-->
+                    <!-- <div google-chart chart="chartObject[1]"></div>-->
                     </div>
 
                 </ion-content>
@@ -49,7 +49,7 @@
                 <ion-content>
                     <span></span>
                     <div style="overflow:scroll;">
-                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" chart="chart3" ng-click="handleChartClick($event)">
+                        <canvas tc-chartjs-bar chart-data="data" chart-options="options" chart="chart3" ng-click="handleChartClick($event)">
                         </canvas>
                     </div>
 
@@ -63,8 +63,8 @@
                     <span></span>
                     <!--
                     <div google-chart chart="chartObject[3]"></div>-->
-                     <div style="overflow:scroll;">
-                        <canvas  tc-chartjs-bar  chart-data="data" chart-options="options" chart="chart4" ng-click="handleChartClick($event)">
+                    <div style="overflow:scroll;">
+                        <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/events-modal.html b/www/templates/events-modal.html
index 221e0dc7..c904c9d0 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -11,37 +11,25 @@
         </h1>
     </ion-header-bar> -->
     <ion-content>
-         <div ng-controller="ModalCtrl">
-
-        <!-- replay can also be gapless -->
+        <div ng-controller="ModalCtrl">
 
+            <!-- replay can also be gapless -->
 
             <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?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps={{loginData.maxFPS}}&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" />
             </ion-scroll>
-
-
         </div>
     </ion-content>
 </ion-modal-view>
 
-    <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="exit event view" ng-click="closeModal()"></button>
-
-
-        <a mfb-button icon="ion-skip-backward" label="previous" ng-click="controlEventStream(eventCommands.previous)"></a>
-
-
-        <a mfb-button icon="ion-skip-forward" label="next" ng-click="controlEventStream(eventCommands.next)"></a>
-
-
-
-    </nav>
-
-    <nav mfb-menu position="bl" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click">
-        <a mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView()"></a>
-
-        <a mfb-button icon="ion-pause" label="pause" ng-click="controlEventStream(eventCommands.pause)"></a>
-
-        <a mfb-button icon="ion-play" label="play" ng-click="controlEventStream(eventCommands.play)"></a>
-    </nav>
+<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="exit event view" ng-click="closeModal()"></button>
+    <a mfb-button icon="ion-skip-backward" label="previous" ng-click="controlEventStream(eventCommands.previous)"></a>
+    <a mfb-button icon="ion-skip-forward" label="next" ng-click="controlEventStream(eventCommands.next)"></a>
+</nav>
+
+<nav mfb-menu position="bl" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click">
+    <a mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView()"></a>
+    <a mfb-button icon="ion-pause" label="pause" ng-click="controlEventStream(eventCommands.pause)"></a>
+    <a mfb-button icon="ion-play" label="play" ng-click="controlEventStream(eventCommands.play)"></a>
+</nav>
diff --git a/www/templates/events.html b/www/templates/events.html
index 7c3b2bf3..0f9a5570 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -1,5 +1,5 @@
 <ion-view view-title="" cache-view="false">
-<!-- <ion-nav-title>{{viewTitle.title}} Events</ion-nav-title>-->
+    <!-- <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>
@@ -7,48 +7,26 @@
 
     <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>-->
-
+        <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>
     </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"  >
-
-        </label>
+    <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-header-bar>
+            </label>
+        </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-refresher pulling-text="Tap the <i class='ion-refresh'></i> icon above to reload ..." spinner="bubbles" on-refresh="dummyDoRefresh();"></ion-refresher>
 
-        <ion-item collection-repeat="event in events| filter:search.text"  >
+        <ion-item collection-repeat="event in events| filter:search.text">
 
             <div class="row">
                 <div class="col col-left">
@@ -77,22 +55,22 @@
                 <!-- col col left-->
 
                 <div class="col col-80">
-                    <div class="item-text-wrap"><i class="ion-monitor"></i> <b>{{event.Event.MonitorName}}</b> ({{event.Event.Name}})</div>
+                    <div class="item-text-wrap">
+                        <i class="ion-monitor"></i> <b>{{event.Event.MonitorName}}</b> ({{event.Event.Name}})
+                    </div>
 
                     <i class="ion-images"></i> {{event.Event.Frames}} &nbsp;
                     <i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} &nbsp;
                     <i class="ion-arrow-graph-up-right"></i> {{event.Event.TotScore}}
 
                     <span style="float:right">
-                                <button class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(event.Event.Id, event.Event.Name, event.Event.Length)" >View Footage</button></span>
-
+                                <button class="button button-small icon icon-left ion-ios-eye"
+                                        ng-click="openModal(event.Event.Id, event.Event.Name, event.Event.Length)" >View Footage</button>
+                    </span>
                 </div>
 
-                <!--<div class="col">
-                                <img ng-src="{{event.image}}" style="float:right; height:40px;" />
-                            </div> -->
-
             </div>
+            <!--row-->
 
             <div class="row" style="font-size:80%; color:rgb(110,110,110)">
                 <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp;{{event.Event.StartTime}}
diff --git a/www/templates/help.html b/www/templates/help.html
index decdf47e..e5f18bd8 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -6,63 +6,57 @@
 
 
     <ion-content class="padding">
-    <div class="list">
+        <div class="list">
 
-        <ion-item class="item-text-wrap">
-            <h2><b> What is an API path?</b> </h2>
-        The latest versions of ZoneMinder have an API that is supposed to replace the XML skin.
-        It is only available starting Zoneminder 1.29. If you don't have
-        the API installed the client WILL NOT WORK.
+            <ion-item class="item-text-wrap">
+                <h2><b> What is an API path?</b> </h2> The latest versions of ZoneMinder have an API that is supposed to replace the XML skin. It is only available starting Zoneminder 1.29. If you don't have the API installed the client WILL NOT WORK.
 
-        </ion-item>
+            </ion-item>
 
-        <ion-item class="item-text-wrap">
-            <h2><b> What is ZM base URL, portal alias and API path</b> </h2>
-        Okay, there are multiple ways you can install ZoneMinder. For example, let's say you access zoneminder via http://yourserver.com:8000/zm. Then, http://yoursever.com:8000 is the base portal URL and the alias is zm. It's important you get these right, otherwise the app won't be able to display the data.
-        </ion-item>
+            <ion-item class="item-text-wrap">
+                <h2><b> What is ZM base URL, portal alias and API path</b> </h2> Okay, there are multiple ways you can install ZoneMinder. For example, let's say you access zoneminder via http://yourserver.com:8000/zm. Then, http://yoursever.com:8000 is the base portal URL and the alias is zm. It's important you get these right, otherwise the app won't be able to display the data.
+            </ion-item>
 
 
 
-        <ion-item class="item-text-wrap">
-            <h2> <b>What should I be entering in the Base URL and API URL?</b></h2>
-        The base url is typically of the format "http://yourserver:port/" (don't specify zm)
-        The API url is typically of the format "http://yourserver:port/zm/api"
-        But it depends on how you've installed ZoneMinder
-        </ion-item>
+            <ion-item class="item-text-wrap">
+                <h2> <b>What should I be entering in the Base URL and API URL?</b></h2> The base url is typically of the format "http://yourserver:port/" (don't specify zm) The API url is typically of the format "http://yourserver:port/zm/api" But it depends on how you've installed ZoneMinder
+            </ion-item>
 
 
-        <ion-item class="item-text-wrap">
-            <h2> <b>I do not have authentication enabled but the app keeps asking me to specify authentication</b></h2>
-        If you don't use ZM authentication, just enter an "x" in both user name and password.
-        </ion-item>
+            <ion-item class="item-text-wrap">
+                <h2> <b>I do not have authentication enabled but the app keeps asking me to specify authentication</b></h2> If you don't use ZM authentication, just enter an "x" in both user name and password.
+            </ion-item>
 
 
-        <ion-item class="item-text-wrap">
-            <h2><b> The data is not refreshing!</b></h2>
-        Most screens that show lists of data has a pull down action. Pull down to refresh and your data
-        should be reloaded.
-        </ion-item>
+            <ion-item class="item-text-wrap">
+                <h2><b> The data is not refreshing!</b></h2> Most screens that show lists of data has a pull down action. Pull down to refresh and your data should be reloaded.
+            </ion-item>
 
-        <ion-item class="item-text-wrap">
-            <h2><b> What do all the colors in the Monitor view mean?</b></h2>
-        <i class="icon ion-checkmark-circled" style="color:#1E90FF"></i> Checking <br/>
-        <i class="icon ion-checkmark-circled" style="color:green"></i> All good <br/>
-        <i class="icon ion-close-circled" style="color:red"></i> Not running <br/>
-        <i class="icon ion-close-circled" style="color:orange"></i> Not running (pending) <br/>
-        <i class="icon ion-checkmark-circled" style="color:grey"></i> Disabled <br/>
-              <i class="icon ion-help-circled" style="color:#800000"></i> Unknown <br/>
+            <ion-item class="item-text-wrap">
+                <h2><b> What do all the colors in the Monitor view mean?</b></h2>
+                <i class="icon ion-checkmark-circled" style="color:#1E90FF"></i> Checking
+                <br/>
+                <i class="icon ion-checkmark-circled" style="color:green"></i> All good
+                <br/>
+                <i class="icon ion-close-circled" style="color:red"></i> Not running
+                <br/>
+                <i class="icon ion-close-circled" style="color:orange"></i> Not running (pending)
+                <br/>
+                <i class="icon ion-checkmark-circled" style="color:grey"></i> Disabled
+                <br/>
+                <i class="icon ion-help-circled" style="color:#800000"></i> Unknown
+                <br/>
 
-        </ion-item>
+            </ion-item>
 
-        <ion-item class="item-text-wrap">
-            <h2><b>I want to contribute!</b></h2>
-        Awesome. <a  href="#" onclick="window.open('http://github.com/pliablepixels/zmNinja', '_blank', 'location=yes'); return false;"> Grab</a> the source code!
-        </ion-item>
+            <ion-item class="item-text-wrap">
+                <h2><b>I want to contribute!</b></h2> Awesome. <a href="#" onclick="window.open('http://github.com/pliablepixels/zmNinja', '_blank', 'location=yes'); return false;"> Grab</a> the source code!
+            </ion-item>
 
-        <ion-item class="item-text-wrap">
-            <h2><b>How do I contact the author?</b></h2>
-            Send me an <a  href="#" onclick="window.open('mailto:pliablepixels@gmail.com', '_blank', 'location=yes'); return false;">email</a>
-        </ion-item>
+            <ion-item class="item-text-wrap">
+                <h2><b>How do I contact the author?</b></h2> Send me an <a href="#" onclick="window.open('mailto:pliablepixels@gmail.com', '_blank', 'location=yes'); return false;">email</a>
+            </ion-item>
 
         </div>
 
diff --git a/www/templates/login.html b/www/templates/login.html
index 1ad11b0c..bf1fc487 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -27,8 +27,6 @@
                 <input autocapitalize="none" type="text" placeholder="ZM Api URL" ng-model="loginData.apiurl">
             </label>
         </div>
-
-
             <button class="button button-block button-balanced icon ion-locked" ng-click="login()"> Save</button>
 
     </ion-content>
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index f8f15029..0e1401ab 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -1,59 +1,30 @@
 <ion-modal-view cache="false">
-
-    <!-- <ion-header-bar>
-        <h1 class="title">
-            <span style="float:left">
-                <button class="button  button-clear icon icon-left ion-close" ng-click="closeModal()" >Close</button>
-            </span>
-            <span style="float:right">
-                {{eventName}} (Duration:{{eventDur}}s)
-            </span>
-        </h1>
-    </ion-header-bar> -->
     <ion-content>
         <div ng-controller="ModalCtrl">
 
-        <!-- replay can also be gapless imageonload="finishedLoadingImage()"-->
-
+            <!-- replay can also be gapless imageonload="finishedLoadingImage()"-->
 
-        <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={{LoginData.maxFPS}}&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>
 
+            </ion-scroll>
     </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>-->
-
-
 
     <div ng-show="isControllable=='1' && showPTZ">
         <div class="ptzcentered">
             <circular options="radialMenuOptions">
             </circular>
         </div>
-        </div>
     </div>
-
-
+    </div>
 
 </ion-modal-view>
 
 <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-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>
+    <button mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView()"></button>
+    <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>
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 7b6b00b3..1945fa22 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -9,27 +9,24 @@
         <div ng-controller="ModalCtrl">
             <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
             <div class="list card" ng-repeat="monitor in monitors">
-                <!-- <a href="#/app/events" ng-click="toggleLeft()"> -->
+
                 <div class="item" ng-style="{'background-color': monitor.Monitor.Enabled=='1'?'white':'white'}">
                     <div ng-if="monitor.Monitor.Enabled == '1'">
                         <span class='item item-icon-left item-icon-right'>
-                <i class="icon ion-ios-monitor-outline"></i>
-                 <b>{{monitor.Monitor.Name}}</b>
-
+                            <i class="icon ion-ios-monitor-outline"></i>
+                            <b>{{monitor.Monitor.Name}}</b>
+                            <i class="icon {{monitor.Monitor.char}}" style="color:{{monitor.Monitor.color}};"></i>
 
-                <i class="icon {{monitor.Monitor.char}}" style="color:{{monitor.Monitor.color}};"></i>
-
-                </span>
+                        </span>
                     </div>
 
 
                     <div ng-if="monitor.Monitor.Enabled != '1'">
                         <span class='item item-icon-left item-icon-right'>
-                    <i class="icon ion-ios-monitor-outline"></i>
-                     <b>{{monitor.Monitor.Name}}</b>
-                    <i class="icon {{monitor.Monitor.char}}" style="color:grey;"></i>
-                </span>
-
+                        <i class="icon ion-ios-monitor-outline"></i>
+                         <b>{{monitor.Monitor.Name}}</b>
+                        <i class="icon {{monitor.Monitor.char}}" style="color:grey;"></i>
+                    </span>
                     </div>
 
 
@@ -41,7 +38,8 @@
                         <br/> Alarm Max FPS:{{monitor.Monitor.AlarmMaxFPS}}
                         <br/> Alarm Frame Count: {{monitor.Monitor.AlarmFrameCount}}
                         <br/> Status: {{monitor.Monitor.isRunningText}}
-                        <br/><br/>
+                        <br/>
+                        <br/>
                     </p>
 
                     <div style="float:right;">
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 822212bc..d1106e2e 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -10,63 +10,55 @@
     </ion-nav-buttons>
 
 
-    <ion-content  padding="true" >
+    <ion-content padding="true">
         <div ng-controller="ModalCtrl">
-
-        <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
-
-
+            <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
             <span ng-show="!minimal">
-        <div class=" range range-positive">
-            <i class="icon ion-arrow-shrink"></i>
+                <div class=" range range-positive">
+                    <i class="icon ion-arrow-shrink"></i>
 
-            <input type="range" ng-model="slider.monsize" min="1" max="6" ng-change="sliderChanged()">
-            <i class="icon ion-arrow-expand"></i>
+                    <input type="range" ng-model="slider.monsize" min="1" max="6" ng-change="sliderChanged()">
+                    <i class="icon ion-arrow-expand"></i>
 
-        </div>
+                </div>
         </span>
 
- <div class="wrapper">
-            <span ng-repeat="monitor in monitors| limitTo: monLimit">
-
-            <span ng-show="!minimal">
-                <header class="header">&nbsp;<i class="ion-monitor"></i>
-                    {{monitor.Monitor.Name}}&nbsp;</header>
-
-
-            </span>
-            <article class="main">
-                <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-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)" on-hold="onHold($index)" on-release="onRelease($index)" />
-            </article>
-
-            <span ng-show="!minimal">
-
-                <span style="font-size:10px;">
-               <footer class="footer">
-                  
-                   {{monitor.Monitor.Enabled=="1"?"Enabled":"Not Enabled"}}
-                   &nbsp;
-                   <span style="float:right">
-                       <i class="icon ion-android-alert"></i>
-                       
-                       :{{monitor.Monitor.Function}}
-                    </span>
-            </footer>
-            </span>
-
-
-            </span>
-            </span>
-
-            <div ng-show="minimal">
-                <br/>
-                <button class="button button-outline button-positive" ng-click="switchMinimal()">
-                    exit full screen view
-                </button>
-
+            <div class="wrapper">
+                <span ng-repeat="monitor in monitors| limitTo: monLimit">
+
+                <span ng-show="!minimal">
+                    <header class="header">&nbsp;<i class="ion-monitor"></i>
+                        {{monitor.Monitor.Name}}&nbsp;</header>
+                </span>
+                <article class="main">
+                    <!-- FIXME: Scale is 50% hardcoded -->
+                    <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-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)" on-hold="onHold($index)" on-release="onRelease($index)" />
+                </article>
+
+                <span ng-show="!minimal">
+                    <span style="font-size:10px;">
+                        <footer class="footer">
+
+                       {{monitor.Monitor.Enabled=="1"?"Enabled":"Not Enabled"}}
+                       &nbsp;
+                           <span style="float:right">
+                               <i class="icon ion-android-alert"></i>
+
+                               :{{monitor.Monitor.Function}}
+                            </span>
+                </footer>
+                </span>
+                </span>
+                </span>
+
+                <div ng-show="minimal">
+                    <br/>
+                    <button class="button button-outline button-positive" ng-click="switchMinimal()">
+                        exit full screen view
+                    </button>
+                </div>
             </div>
         </div>
-        </div>
+        <!--ngcontroller -->
     </ion-content>
-
 </ion-view>
diff --git a/www/templates/state.html b/www/templates/state.html
index a326652b..56679db2 100644
--- a/www/templates/state.html
+++ b/www/templates/state.html
@@ -60,7 +60,7 @@
 
                 <div class="button-bar" ng-show="showDanger">
                     <a class="button button-outline button-dark " ng-click="controlZM('restart');" href="">Restart</a>
-                    <a class="button button-outline  button-dark" href="" ng-click="controlZM('stop');" >Stop</a>
+                    <a class="button button-outline  button-dark" href="" ng-click="controlZM('stop');">Stop</a>
                     <a class="button button-outline button-dark" ng-click="controlZM('start');" href="">Start</a>
                 </div>
             </ion-item>
-- 
cgit v1.2.3