From 544413f2d6de83e085d4489a1b9ccbaac3fa192d Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Fri, 26 Jun 2015 13:43:17 -0400
Subject: I am now reading the PTZ DB to figure out the right "move" command
 for the cameras

---
 www/templates/help.html     | 22 ++++++++++++++--------
 www/templates/monitors.html |  2 +-
 www/templates/montage.html  |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/help.html b/www/templates/help.html
index e5f18bd8..011f577c 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -9,21 +9,20 @@
         <div class="list">
 
             <ion-item class="item-text-wrap">
-                <h2><b> What is an API path?</b> </h2> The latest versions of ZoneMinder have an API that is supposed to replace the XML skin. It is only available starting Zoneminder 1.29. If you don't have the API installed the client WILL NOT WORK.
+                <h2><b> What do I enter for ZM Portal URL, Base path to cgi-bin and ZM API URL?</b> </h2>
+                <ul>
 
+                    <li>ZM Portal URL: The URL using which you can access ZM (example http://myserver.ddns.net/zm)</li>
+                <li>CGI base path: The URL using which your cgi-bin directory is accessible (example http://myserver.ddns.net/). You don't have to enter cgi-bin explictly</li>
+                <li>API Url: The URL using which your API directory is accessible (example: http://myserver.ddns.net/zm/api)</li>
+                </ul>
             </ion-item>
 
             <ion-item class="item-text-wrap">
-                <h2><b> What is ZM base URL, portal alias and API path</b> </h2> Okay, there are multiple ways you can install ZoneMinder. For example, let's say you access zoneminder via http://yourserver.com:8000/zm. Then, http://yoursever.com:8000 is the base portal URL and the alias is zm. It's important you get these right, otherwise the app won't be able to display the data.
-            </ion-item>
-
-
+                <h2><b>Since when does ZM have an API?</b> </h2> The latest versions of ZoneMinder have an API that is supposed to replace the XML skin. It is only available starting Zoneminder 1.29. If you don't have the API installed the client WILL NOT WORK.
 
-            <ion-item class="item-text-wrap">
-                <h2> <b>What should I be entering in the Base URL and API URL?</b></h2> The base url is typically of the format "http://yourserver:port/" (don't specify zm) The API url is typically of the format "http://yourserver:port/zm/api" But it depends on how you've installed ZoneMinder
             </ion-item>
 
-
             <ion-item class="item-text-wrap">
                 <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>
@@ -50,6 +49,13 @@
 
             </ion-item>
 
+
+            <ion-item class="item-text-wrap">
+                <h2> <b>I can't connect using SSL!</b></h2>
+                Configuring SSL requires additional steps. It's not as simple as flipping the switch on in the app. Please read the <a href="#" onclick="window.open('https://github.com/pliablepixels/zmNinja/blob/master/docs/SSL-Configuration.md', '_blank', 'location=yes'); return false;">instructions</a> for more details.
+            </ion-item>
+
+
             <ion-item class="item-text-wrap">
                 <h2><b>I want to contribute!</b></h2> Awesome. <a href="#" onclick="window.open('http://github.com/pliablepixels/zmNinja', '_blank', 'location=yes'); return false;"> Grab</a> the source code!
             </ion-item>
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 1945fa22..13dcdb83 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -45,7 +45,7 @@
                     <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 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)">Live View</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>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 7fed7ff3..46129fd8 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -32,7 +32,7 @@
                 </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)" />
+                    <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, monitor.Monitor.ControlId)" on-hold="onHold($index)" on-release="onRelease($index)" />
                 </article>
 
                 <span ng-show="!minimal">
-- 
cgit v1.2.3