From c76e9d5c78e0cd48f938218dc97fb67e7bcac51d Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Thu, 4 Jun 2015 11:31:09 -0400
Subject: Created new screen for developer options, removed simulation mode
 (its practically useless)

---
 www/templates/devoptions.html     | 39 +++++++++++++++++++++++++++++++++++++++
 www/templates/events-modal.html   |  2 +-
 www/templates/help.html           | 10 ----------
 www/templates/login.html          | 13 -------------
 www/templates/monitors-modal.html |  2 +-
 5 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 www/templates/devoptions.html

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
new file mode 100644
index 00000000..95c6d4e3
--- /dev/null
+++ b/www/templates/devoptions.html
@@ -0,0 +1,39 @@
+<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>
+
+
+    <ion-content class="padding">
+        <div class="list list-inset">
+
+            <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;
+                <label class="item-input-wrapper">
+                    <input type="tel" placeholder="be careful" ng-model="loginData.maxMontage">
+                </label>
+
+            </div>
+
+            <div class="item item-input-inset">
+
+                Max FPS for streaming&nbsp;
+                <label class="item-input-wrapper">
+                    <input type="tel" placeholder="max is 30" ng-model="loginData.maxFPS">
+                </label>
+
+            </div>
+
+
+
+            <button class="button button-block button-balanced icon ion-locked" ng-click="saveDevOptions()"> Save</button>
+
+
+    </ion-content>
+</ion-view>
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 4cb76867..ca73ae9c 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -16,7 +16,7 @@
         <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?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" 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>
 
 
diff --git a/www/templates/help.html b/www/templates/help.html
index c2c43947..55d22d9e 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -43,16 +43,6 @@
         should be reloaded.
         </ion-item>
 
-        <ion-item class="item-text-wrap">
-            <h2><b> What is this simulator mode?</b></h2>
-        It was really a way for me to test how the app behaves when there are 1000s of events and many monitors.
-        Practically, you won't have a need for it
-        </ion-item>
-
-        <ion-item class="item-text-wrap">
-            <h2><b>When I switch between Simulator to Real mode, the data does not change</b></h2>
-        Pull to refresh.
-        </ion-item>
 
         <ion-item class="item-text-wrap">
             <h2><b>I want to contribute!</b></h2>
diff --git a/www/templates/login.html b/www/templates/login.html
index d5537641..3c074c99 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -27,19 +27,6 @@
                 <input autocapitalize="none" type="text" placeholder="ZM Api URL" ng-model="loginData.apiurl">
             </label>
         </div>
-        <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;
-    <label class="item-input-wrapper">
-      <input type="tel" placeholder="be careful" ng-model="loginData.maxMontage">
-    </label>
-
-
-
-  </div>
-        <button class="button button-block button-balanced icon ion-locked" ng-click="login()"> Save</button>
-
 
     </ion-content>
 </ion-view>
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index f21beae4..23562a7a 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -17,7 +17,7 @@
         <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=3&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={{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>
-- 
cgit v1.2.3