summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
authorARC <arjunrc@gmail.com>2015-05-09 19:18:30 -0400
committerARC <arjunrc@gmail.com>2015-05-09 19:18:30 -0400
commitfdb1d93c54e4c67639185f2c859b1fec6a5fb904 (patch)
tree3e4154164a3fc8f349503748b30fd99cd4946607 /www/templates
parentbfe426a83bfcd32bac22bc06cccb15f15a9f9450 (diff)
Added support to limit maximum monitors in Montage View and also added a portal alias - those who many not be using one can keep this empty
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/help.html6
-rw-r--r--www/templates/login.html19
-rw-r--r--www/templates/montage.html4
3 files changed, 25 insertions, 4 deletions
diff --git a/www/templates/help.html b/www/templates/help.html
index b11506ec..0720bac7 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -25,6 +25,12 @@
<ion-item>
+ <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>
<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.
diff --git a/www/templates/login.html b/www/templates/login.html
index 0e302c9e..bf5170d1 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -7,6 +7,7 @@
<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 portal</span>
<label class="item item-input">
<input autocapitalize="none" type="text" placeholder="Username" ng-model="loginData.username">
</label>
@@ -14,15 +15,29 @@
<input type="password" placeholder="Password" ng-model="loginData.password">
</label>
<label class="item item-input">
- <input autocapitalize="none" type="text" placeholder="ZM base URL (please don't add /zm)" ng-model="loginData.url">
+ <input autocapitalize="none" type="text" placeholder="ZM base URL " ng-model="loginData.url">
</label>
+
+ <label class="item item-input">
+ <input autocapitalize="none" type="text" placeholder="ZM portal alias (if any) " ng-model="loginData.alias">
+ </label>
+
+ <span style="color:rgb(100,100,100)"><br/><i class="ion-social-angular" style="font-size:150%"></i> ZoneMinder API</span>
<label class="item item-input">
<input autocapitalize="none" type="text" placeholder="API base 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">
+ Maximum Monitors in Montage View&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>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index d8c6ac53..2cbe9fa9 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -16,8 +16,8 @@
</div>
<!-- Hi:{{slider.monsize}} {{devWidth}} -->
<div class="wrapper">
-
- <span ng-repeat="monitor in monitors">
+{{monLimit}}
+ <span ng-repeat="monitor in monitors| limitTo: monLimit">
<header class="header">&nbsp;<i class="ion-monitor"></i> {{monitor.Monitor.Name}}&nbsp;</header>