From 89640e9b0212a2525ea132b1d11bb8962f5444dd Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Thu, 16 Jul 2015 15:06:41 -0400
Subject: general formatting

---
 www/templates/montage.html | 96 ++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 54 deletions(-)

(limited to 'www/templates/montage.html')

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>
-- 
cgit v1.2.3