general formatting

11 files changed, 223 insertions, 223 deletions

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 04b90af1..0ebe38e8 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -1,5 +1,4 @@
 <ion-view view-title="Developer Settings">
-
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
     </ion-nav-buttons>
@@ -33,7 +32,8 @@
             </div>
 
             <button class="button button-block button-balanced icon ion-locked"
-                    ng-click="saveDevOptions()"> Save</button>
-
+                    ng-click="saveDevOptions()"> Save
+            </button>
+        </div>
     </ion-content>
 </ion-view>
diff --git a/www/templates/events-graphs.html b/www/templates/events-graphs.html
index 84aea168..2d488170 100644
--- a/www/templates/events-graphs.html
+++ b/www/templates/events-graphs.html
@@ -7,18 +7,20 @@
     <!-- I'm calling the same controller function but with different parameters when
             you switch between tabs -->
 
-    <!-- All Events view -->
-
     <!-- Oddly, unless I add a "div ng-controller" before each canvas
     onClick handler does not work
     -->
 
+    <!-- All Events view -->
+
     <ion-tabs class="tabs-icon-top tabs-stable">
         <ion-tab title="All" icon="ion-stats-bars" on-select="generateTCChart(0,'All Events',0)">
             <ion-nav-view>
                 <ion-content class="has-header">
                     <div ng-controller="zmApp.EventsGraphsCtrl">
-                    <canvas tc-chartjs-bar chart-data="chart.data" chart-options="chart.options" ng-click="handleChartClick($event)" chart="chartwithbars">
+                    <canvas tc-chartjs-bar chart-data="chart.data"
+                            chart-options="chart.options"
+                            ng-click="handleChartClick($event)" chart="chartwithbars">
                     </canvas>
                     </div>
                 </ion-content>
@@ -32,8 +34,10 @@
                 <ion-content>
                     <div ng-controller="zmApp.EventsGraphsCtrl">
                     <div style="overflow:scroll;">
-                        <canvas tc-chartjs-bar chart-data="chart.data" chart-options="chart.options"
-                                ng-click="handleChartClick($event)" chart="chartwithbars">
+                        <canvas tc-chartjs-bar chart-data="chart.data"
+                                chart-options="chart.options"
+                                ng-click="handleChartClick($event)"
+                                chart="chartwithbars">
                         </canvas>
                         </div>
                     </div>
@@ -64,16 +68,16 @@
             <ion-nav-view>
                 <ion-content>
                     <div ng-controller="zmApp.EventsGraphsCtrl">
-                    <div style="overflow:scroll;">
-                        <canvas tc-chartjs-bar chart-data="chart.data"
-                                chart-options="chart.options" chart="chartwithbars"
-                                ng-click="handleChartClick($event)">
-                        </canvas>
-                    </div>
+                        <div style="overflow:scroll;">
+                            <canvas tc-chartjs-bar chart-data="chart.data"
+                                    chart-options="chart.options"
+                                    chart="chartwithbars"
+                                    ng-click="handleChartClick($event)">
+                            </canvas>
+                        </div>
                     </div>
                 </ion-content>
             </ion-nav-view>
         </ion-tab>
     </ion-tabs>
-
 </ion-view>
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 8750895d..610ef068 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -1,50 +1,53 @@
 <ion-modal-view cache="false">
     <ion-content style="background-color:#444444">
-        <!-- so I can access my common modal controller
-            which is shared between events and monitors for modal views -->
-        <div> <!-- ng-controller="ModalCtrl">-->
-            <ion-scroll has-bouncing=false min-zoom=1 zooming="true"
-                        direction="xy" style="width: 100%; ">
-                   <div style="height: 100vh;">
+        <ion-scroll has-bouncing=false min-zoom=1 zooming="true"
+                    direction="xy" style="width: 100%; ">
+            <div style="height: 100vh;">
                 <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}}" ng-class="{'zm-image-fit':imageStyle==true, 'zm-image-crop':imageStyle==false}" />
-                </div>
-            </ion-scroll>
-        </div>
-
+                     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}}"
+                     ng-class="{'zm-image-fit':imageStyle==true, 'zm-image-crop':imageStyle==false}" />
+            </div>
+        </ion-scroll>
     </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-reply" label="previous event" ng-click="controlEventStream(eventCommands.previous)"></a>
-    <a mfb-button icon="ion-forward" label="next event" ng-click="controlEventStream(eventCommands.next)"></a>
+<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-reply" label="previous event"
+       ng-click="controlEventStream(eventCommands.previous)"></a>
+    <a mfb-button icon="ion-forward" label="next event"
+       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">
+<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>
+    <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="tr" effect="zoomin" label="collapse" active-icon="ion-chevron-up" resting-icon="ion-chevron-down" toggling-method="click">
-    <a mfb-button icon="ion-ios-fastforward" label="fast forward" ng-click="controlEventStream(eventCommands.fastFwd)"></a>
-    <a mfb-button icon="ion-ios-fastforward-outline" label="slow forward" ng-click="controlEventStream(eventCommands.slowFwd)"></a>
-    <a mfb-button icon="ion-ios-rewind" label="fast rewind" ng-click="controlEventStream(eventCommands.fastRev)"></a>
-    <a mfb-button icon="ion-ios-rewind-outline" label="slow rewind" ng-click="controlEventStream(eventCommands.slowRev)"></a>
-
+<nav mfb-menu position="tr" effect="zoomin" label="collapse"
+     active-icon="ion-chevron-up" resting-icon="ion-chevron-down"
+     toggling-method="click">
+    <a mfb-button icon="ion-ios-fastforward" label="fast forward"
+       ng-click="controlEventStream(eventCommands.fastFwd)"></a>
+    <a mfb-button icon="ion-ios-fastforward-outline" label="slow forward"
+       ng-click="controlEventStream(eventCommands.slowFwd)"></a>
+    <a mfb-button icon="ion-ios-rewind" label="fast rewind"
+       ng-click="controlEventStream(eventCommands.fastRev)"></a>
+    <a mfb-button icon="ion-ios-rewind-outline" label="slow rewind"
+       ng-click="controlEventStream(eventCommands.slowRev)"></a>
 </nav>
 
-<progress  max="{{totalEventTime}}" value="{{currentEventTime}}" class="eventprogress"></progress>
-
+<progress max="{{totalEventTime}}" value="{{currentEventTime}}"
+          class="eventprogress"></progress>
 
 
-<!--
-<span class="eventbuttons">
-<a class="button icon button-balanced ion-gear-a"></a>
-<a class="button button-balanced icon ion-gear-a"></a>
-    <a class="button icon button-balanced ion-gear-a"></a>
-<a class="button button-balanced icon ion-gear-a"></a>
-</span>-->
 
diff --git a/www/templates/events.html b/www/templates/events.html
index 06ac9a3e..bf1ddc5e 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -1,31 +1,35 @@
 <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>
+        <button class="button button-icon button-clear ion-navicon"
+                ng-click="openMenu()">
+        </button>
     </ion-nav-buttons>
 
     <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 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>
     </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">
-
+                <input type="search" placeholder="Search"
+                       ng-model="search.text" autocorrect="off" autocomplete="off">
             </label>
         </ion-header-bar>
     </div>
 
 
     <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-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">
 
@@ -51,50 +55,46 @@
                     <!-- ng switch -->
                     <!-- {{event.Event.Cause}} -->
 
-                    <br/> <span style="font-size:80%; color:rgb(110,110,110)">{{event.Event.Length}}s</span>
+                    <br/>
+                    <span style="font-size:80%; color:rgb(110,110,110)">
+                        {{event.Event.Length}}s
+                    </span>
                 </div>
                 <!-- 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}})
+                        <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}}
-
-
                 </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;{{prettify(event.Event.StartTime)}}
+                <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp;
+                    {{prettify(event.Event.StartTime)}}
                     <br/>
                     <i class="ion-clipboard"></i>&nbsp; {{event.Event.Notes}}
                     <br/>
-
                 </div>
             </div>
             <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,event.Event.Frames)" > 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,event.Event.Frames)" > View Footage
+                </button>
+            </span>
         </ion-item>
 
         <ion-item ng-show="!events.length">
-        No events found.
+        No events to display.
         </ion-item>
 
 
         <ion-infinite-scroll ng-if="moreDataCanBeLoaded()" icon="ion-loading-c" on-infinite="loadMore()" distance="2%">
         </ion-infinite-scroll>
-
-        <!--</div> -->
-        <!--</ion-list>-->
-
     </ion-content>
 </ion-view>
diff --git a/www/templates/help.html b/www/templates/help.html
index bd53f02e..0d3a9998 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -8,8 +8,6 @@
     <ion-content class="padding">
         <div class="list">
 
-
-
             <ion-item class="item-text-wrap">
                 <h2><b> What do I enter for ZM Portal URL, Base path to cgi-bin and ZM API URL?</b> </h2>
                 <ul>
diff --git a/www/templates/log.html b/www/templates/log.html
index f513508a..0c91dd90 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -6,12 +6,12 @@
 
     <ion-nav-buttons side="right">
         <a class="button button-icon icon ion-trash-a" ng-href="" ng-click="deleteLogs()"></a>
-        <a style="" class="button button-icon icon ion-email" ng-href="" ng-click="sendEmail(zmLog.logString)" > </a>
+        <a style="" class="button button-icon icon ion-email"
+           ng-href="" ng-click="sendEmail(zmLog.logString)" > </a>
     </ion-nav-buttons>
 
     <ion-content class="padding">
         <b>zmNinja Version: {{zmAppVersion}}</b><br/>
         <!-- don't indent here -- its a pre-->
         <pre>{{zmLog.logString}}</pre>
-
     </ion-content>
diff --git a/www/templates/login.html b/www/templates/login.html
index 7f89da7a..764a2842 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -4,45 +4,65 @@
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
     </ion-nav-buttons>
 
-
     <ion-content class="padding">
         <div class="list list-inset">
-            <span style="color:rgb(100,100,100)"> <i class="ion-android-home" style="font-size:150%"></i> ZoneMinder Settings</span>
+            <span style="color:rgb(100,100,100)">
+                <i class="ion-android-home" style="font-size:150%"></i>
+                ZoneMinder Settings
+            </span>
             <label class="item item-input item-floating-label">
                 <span class="input-label">username</span>
-                <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="username" ng-model="loginData.username">
+                <input autocapitalize="none" autocomplete="off"
+                       autocorrect="off" type="text"
+                       placeholder="username"
+                       ng-model="loginData.username">
             </label>
             <label class="item item-input item-floating-label">
                 <span class="input-label">password</span>
-                <input type="password" placeholder="password" ng-model="loginData.password">
+                <input type="password" placeholder="password"
+                       ng-model="loginData.password">
             </label>
             <label class="item item-input item-floating-label">
                 <span class="input-label">ZM portal url</span>
-                <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM portal url " ng-model="loginData.url" ng-keyup="portalKeypress($event)">
+                <input autocapitalize="none" autocomplete="off"
+                       autocorrect="off" type="text"
+                       placeholder="ZM portal url "
+                       ng-model="loginData.url" ng-keyup="portalKeypress($event)">
             </label>
 
             <label class="item item-input item-floating-label">
                 <span class="input-label">base path to cgi-bin</span>
-                <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="base path to cgi-bin" ng-model="loginData.streamingurl">
+                <input autocapitalize="none" autocomplete="off"
+                       autocorrect="off" type="text"
+                       placeholder="base path to cgi-bin"
+                       ng-model="loginData.streamingurl">
             </label>
 
             <label class="item item-input item-floating-label">
                 <span class="input-label">ZM api url</span>
-                <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM api url" ng-model="loginData.apiurl">
+                <input autocapitalize="none"
+                       autocomplete="off" autocorrect="off"
+                       type="text" placeholder="ZM api url"
+                       ng-model="loginData.apiurl">
             </label>
 
-            <label >
-            <ion-toggle ng-model="loginData.useSSL" ng-checked="{{loginData.useSSL}}" toggle-class="toggle-calm">Use SSL</ion-toggle>
+            <label>
+            <ion-toggle ng-model="loginData.useSSL"
+                        ng-checked="{{loginData.useSSL}}"
+                        toggle-class="toggle-calm">Use SSL</ion-toggle>
             </label>
 
-             <label >
-
-            <ion-toggle ng-model="loginData.keepAwake" ng-checked="{{loginData.keepAwake}}" toggle-class="toggle-calm">Keep display on<p>(When viewing footage)</p></ion-toggle>
+             <label>
 
+            <ion-toggle ng-model="loginData.keepAwake"
+                        ng-checked="{{loginData.keepAwake}}"
+                        toggle-class="toggle-calm">Keep display on<p>(When viewing footage)</p>
+            </ion-toggle>
             </label>
-
         </div>
-            <button class="button button-block button-balanced icon ion-locked" ng-click="save()"> Save</button>
+        <button class="button button-block button-balanced icon ion-locked"
+                    ng-click="save()"> Save
+        </button>
 
     </ion-content>
 </ion-view>
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 366dcc79..afba98b1 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -1,43 +1,40 @@
 <div ng-controller="ModalCtrl">
-<ion-modal-view cache="false" >
-    <ion-content style="background-color:#444444">
-       <div > <!-- </di> ng-controller="ModalCtrl">-->
-
-            <!-- replay can also be gapless imageonload="finishedLoadingImage()"-->
-
-            <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; ">
-                <!-- android needs this 100vh - otherwise max- does not work -->
-
-                <div style="height: 100vh;">
-
-                    <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}}" ng-class="{'zm-image-fit':imageStyle==true, 'zm-image-crop':imageStyle==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" fade-in />
-
-                </div>
-
-
-            </ion-scroll>
-    </ion-content>
-
-    <div ng-show="isControllable=='1' && showPTZ">
-        <div class="ptzcentered">
-            <circular options="radialMenuOptions">
-            </circular>
+    <ion-modal-view cache="false" >
+        <ion-content style="background-color:#444444">
+
+                <ion-scroll has-bouncing=false min-zoom=1 zooming="true"
+                            direction="xy" style="width: 100%; ">
+                    <!-- android needs this 100vh - otherwise max- does not work -->
+
+                    <div style="height: 100vh;">
+                        <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}}" ng-class="{'zm-image-fit':imageStyle==true, 'zm-image-crop':imageStyle==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" />
+                    </div>
+                </ion-scroll>
+        </ion-content>
+
+        <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-arrow-resize" label="fit image" ng-click="scaleImage();"></button>
-    <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>
 
-<span class="camera-icon">
-    <a class="button icon ion-ios-camera button-positive" href="" ng-click="saveImageToPhone(monitorId)"></a>
-</span>
+    </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-arrow-resize" label="fit image" ng-click="scaleImage();">
+        </button>
+        <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>
+
+    <span class="camera-icon">
+        <a class="button icon ion-ios-camera button-positive" href="" ng-click="saveImageToPhone(monitorId)"></a>
+    </span>
 </div>
 
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 9cef5a0f..5ffcbf19 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -1,15 +1,13 @@
 <ion-view view-title="Monitors" cache="false">
-
     <ion-nav-buttons side="left">
-        <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
+        <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()">
+        </button>
     </ion-nav-buttons>
 
-
     <ion-content>
-        <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>
             <div class="list card" ng-repeat="monitor in monitors">
-
                 <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'>
@@ -20,20 +18,17 @@
                         </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>
 
 
-                    <p>Mode :{{monitor.Monitor.Function}}</br>
-                        <!-- Current State: {{monitor.STATE}}</br>
-            Events: {{monitor.NUMEVENTS}}</br> -->
-                        Resolution: {{monitor.Monitor.Width}}*{{monitor.Monitor.Height}}</br>
+                    <p>Mode :{{monitor.Monitor.Function}}<br/>
+                        Resolution: {{monitor.Monitor.Width}}*{{monitor.Monitor.Height}}<br/>
                         Max FPS: {{monitor.Monitor.MaxFPS}}
                         <br/> Alarm Max FPS:{{monitor.Monitor.AlarmMaxFPS}}
                         <br/> Alarm Frame Count: {{monitor.Monitor.AlarmFrameCount}}
@@ -43,19 +38,16 @@
                     </p>
 
                     <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 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, monitor.Monitor.Controllable, monitor.Monitor.ControlId)">Live View</a>
                     </div>
-
                 </div>
             </div>
 
-             <ion-item ng-show="!monitors.length">
-        No Monitors found.
+        <ion-item ng-show="!monitors.length">
+        No monitors to display
         </ion-item>
-
-            <!-- </a> -->
-        </div>
     </ion-content>
 </ion-view>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index f2e34485..a40c312b 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -1,83 +1,71 @@
-<ion-view title="Montage" cache-view="false" hide-nav-bar="{{minimal}}" >
-
+<ion-view title="Montage" 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">
-
-
-        <span style="-webkit-transform: rotate(90deg);
-    -moz-transform: rotate(90deg);
-    -o-transform: rotate(90deg);
-    -ms-transform: rotate(90deg);
-    transform: rotate(90deg);">
-         <button class="button button-icon button-clear ion-arrow-swap" ng-click="toggleReorder();"></button>
-
+            <span class="rotate-button">
+                <button class="button button-icon button-clear ion-arrow-swap"
+                        ng-click="toggleReorder();">
+                </button>
             </span>
+            <button class="button button-icon button-clear ion-android-contract"
+                    ng-click="switchMinimal()">
+            </button>
+        </ion-nav-buttons>
 
-        <button class="button button-icon button-clear ion-android-contract" ng-click="switchMinimal()"></button>
-
-
-
+    <ion-content has-bouncing="false" style="background-color:#e5e5e5">
+        <ion-refresher pulling-text="Pull to reload Monitors..."
+                       spinner="bubbles" on-refresh="doRefresh()">
+        </ion-refresher>
 
-    </ion-nav-buttons>
-
-
-    <ion-content has-bouncing="false" style="background-color:#FEFEFE">
-        <div > <!--ng-controller="ModalCtrl"-->
-           <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
-            <span ng-show="!minimal">
+        <span ng-show="!minimal">
                 <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(slider.monsize)">
+                    <input type="range" ng-model="slider.monsize" min="1"
+                           max="6" ng-change="sliderChanged(slider.monsize)">
                     <i class="icon ion-arrow-expand"></i>
 
                 </div>
         </span>
 
-
-            <div class="wrapper">
-                <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng-if="monitor.Monitor.Function!='None' && monitor.Monitor.listDisplay!='noshow'" >
-
-
+        <div class="wrapper">
+            <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit"
+                  ng-if="monitor.Monitor.Function!='None' && monitor.Monitor.listDisplay!='noshow'">
                 <span ng-show="!minimal">
                     <header class="header">&nbsp;<i class="ion-monitor"></i>
                         {{monitor.Monitor.Name}}&nbsp;</header>
                 </span>
-               <article class="main">
+                <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)/(7-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)" on-hold="onHold($index)" on-release="onRelease($index)" style="display:block;" />
-
-             </article>
-                </span>
-
-                <!--ng repeat -->
-
-            </div>
-
-
+                    <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)/(7-monitorSize[$index]))}}px;"
+                         ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)"
+                         on-hold="onHold($index)"
+                         on-release="onRelease($index)"
+                         style="display:block;" />
+                </article>
+            </span>
         </div>
-        <!--ngcontroller -->
 
-         <ion-item ng-show="!MontageMonitors.length">
-        No monitors found.
-        </ion-item>
 
+        <ion-item ng-show="!MontageMonitors.length">
+            No monitors to display.
+        </ion-item>
     </ion-content>
-    <div ng-show="minimal">
 
-        <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 full screen" ng-click="switchMinimal()"></button>
-             <button mfb-button icon="ion-arrow-expand" label="increase size" ng-click="changeSize(1)"></button>
-            <button mfb-button icon="ion-arrow-shrink" label="decrease size" ng-click="changeSize(-1)"></button>
+    <div ng-show="minimal">
+        <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 full screen"
+                    ng-click="switchMinimal()">
+            </button>
+            <button mfb-button icon="ion-arrow-expand" label="increase size"
+                    ng-click="changeSize(1)">
+            </button>
+            <button mfb-button icon="ion-arrow-shrink" label="decrease size"
+                    ng-click="changeSize(-1)">
+            </button>
         </nav>
-
-
     </div>
-
-
 </ion-view>
diff --git a/www/templates/state.html b/www/templates/state.html
index 599868b7..653d9a71 100644
--- a/www/templates/state.html
+++ b/www/templates/state.html
@@ -3,13 +3,10 @@
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
     </ion-nav-buttons>
-
-
     <ion-content>
-        <ion-refresher pulling-text="Pull to reload data..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
+        <ion-refresher pulling-text="Pull to reload data..."
+                       spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
         <ion-list>
-
-            <!-- <a href="#/app/events" ng-click="toggleLeft()"> -->
             <ion-item>
                 <div class="row">
                     <div class="col col-10">
@@ -55,24 +52,25 @@
             </ion-item>
 
             <ion-item>
-                <button class="button button-full {{dangerButtonColor[showDanger?1:0]}}" ng-click="showDanger=!showDanger">
+                <button class="button button-full {{dangerButtonColor[showDanger?1:0]}}"
+                        ng-click="showDanger=!showDanger">
                     <i class="ion-alert-circled" "style:font-size:300%;"></i> {{dangerText[showDanger?1:0]}}
                 </button>
 
                 <div ng-show="showDanger" >
-
                     <div class="row">
-   <div class="col text-center">
-                     <a class="button button-small button-outline button-dark " ng-click="selectCustomState();" href="">Change State</a>
-                    <a class="button  button-small button-outline button-dark " ng-click="controlZM('restart');" href="">Restart</a>
-                    <a class="button  button-small button-outline  button-dark" href="" ng-click="controlZM('stop');">Stop</a>
-                    <a class="button  button-small button-outline button-dark" ng-click="controlZM('start');" href="">Start</a>
-                        </div></div>
+                        <div class="col text-center">
+                            <a class="button button-small button-outline button-dark "
+                               ng-click="selectCustomState();" href="">Change State</a>
+                            <a class="button  button-small button-outline button-dark "
+                               ng-click="controlZM('restart');" href="">Restart</a>
+                            <a class="button  button-small button-outline  button-dark"
+                               href="" ng-click="controlZM('stop');">Stop</a>
+                            <a class="button  button-small button-outline button-dark" ng-click="controlZM('start');" href="">Start</a>
+                        </div>
+                    </div>
                 </div>
             </ion-item>
-
-
-
         </ion-list>
     </ion-content>
 </ion-view>