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/montage.html | 92 +++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 50 deletions(-)

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

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