summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/templates/events.html10
-rw-r--r--www/templates/help.html29
-rw-r--r--www/templates/log.html1
3 files changed, 25 insertions, 15 deletions
diff --git a/www/templates/events.html b/www/templates/events.html
index e22d9efb..06ac9a3e 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -64,10 +64,7 @@
<i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} &nbsp;
<i class="ion-arrow-graph-up-right"></i> {{event.Event.TotScore}}
- <span style="float:right">
- <button class="button button-small icon icon-left ion-ios-eye"
- ng-click="openModal(event.Event.Id, event.Event.Name, event.Event.Length,event.Event.Frames)" >View Footage</button>
- </span>
+
</div>
</div>
@@ -78,8 +75,13 @@
<br/>
<i class="ion-clipboard"></i>&nbsp; {{event.Event.Notes}}
<br/>
+
</div>
</div>
+ <span style="float:right">
+ <button class="button button-small icon icon-left ion-ios-eye"
+ ng-click="openModal(event.Event.Id, event.Event.Name, event.Event.Length,event.Event.Frames)" > View Footage</button>
+ </span>
</ion-item>
diff --git a/www/templates/help.html b/www/templates/help.html
index 9a979d6b..bd53f02e 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -14,14 +14,14 @@
<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>
+ <li><i class="ion-android-arrow-dropright"></i> ZM Portal URL: The URL using which you can access ZM <p>(example http://myserver.ddns.net/zm)</p></li>
+ <li><i class="ion-android-arrow-dropright"></i> CGI base path: The URL using which your cgi-bin path is accessible<p>(example http://myserver.ddns.net/).</p></li>
+ <li><i class="ion-android-arrow-dropright"></i> API Url: The URL using which your API path is accessible <p>(example:http://myserver.ddns.net/zm/api)</p></li>
</ul>
</ion-item>
<ion-item class="item-text-wrap">
- <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.
+ <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>
@@ -36,25 +36,24 @@
<ion-item class="item-text-wrap">
<h2><b> What do all the colors in the Monitor view mean?</b></h2>
- <i class="icon ion-checkmark-circled" style="color:#1E90FF"></i> Checking
+ <i class="icon ion-checkmark-circled" style="color:#03A9F4"></i> Checking
<br/>
- <i class="icon ion-checkmark-circled" style="color:green"></i> All good
+ <i class="icon ion-checkmark-circled" style="color:#4CAF50"></i> All good
<br/>
- <i class="icon ion-close-circled" style="color:red"></i> Not running
+ <i class="icon ion-close-circled" style="color:#F44336"></i> Not running
<br/>
- <i class="icon ion-close-circled" style="color:orange"></i> Not running (pending)
+ <i class="icon ion-close-circled" style="color:#FF9800"></i> Not running (pending)
<br/>
<i class="icon ion-checkmark-circled" style="color:grey"></i> Disabled
<br/>
- <i class="icon ion-help-circled" style="color:#800000"></i> Unknown
+ <i class="icon ion-help-circled" style="color:#795548"></i> Unknown
<br/>
</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.
+ <h2> <b>I can't connect using SSL!</b></h2> If you are using self-signed certificates, configuring SSL may require 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>
@@ -63,6 +62,14 @@
</ion-item>
<ion-item class="item-text-wrap">
+ <h2><b>I'm having problems with this app</b></h2>Tap on the logs option in the menu. Click the email button on the top right to send them to the author of this app. Note that when the email is composed, zmNinja tries to remove personal information by searching and replacing server IP addresses and server passwords. However it is <b>your responsibility</b> to make sure the logs don't contain any sensitive information. Before you send the email, please review the embedded logs and edit as needed.
+ </ion-item>
+
+ <ion-item class="item-text-wrap">
+ <h2><b>I can see my server URLs and passwords in logs. You said zmNinja removes them?</b></h2>zmNinja tries to remove them <b>after</b> you tap on the email button. I suppose I could remove them from the stored logs too, but then it would be harder for you to figure out if you made a mistake in configuring the app.
+ </ion-item>
+
+ <ion-item class="item-text-wrap">
<h2><b>How do I contact the author?</b></h2> Send me an <a href="#" onclick="window.open('mailto:pliablepixels@gmail.com', '_blank', 'location=yes'); return false;">email</a>
</ion-item>
diff --git a/www/templates/log.html b/www/templates/log.html
index 913094d2..f513508a 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -5,6 +5,7 @@
</ion-nav-buttons>
<ion-nav-buttons side="right">
+ <a class="button button-icon icon ion-trash-a" ng-href="" ng-click="deleteLogs()"></a>
<a style="" class="button button-icon icon ion-email" ng-href="" ng-click="sendEmail(zmLog.logString)" > </a>
</ion-nav-buttons>