diff options
| -rw-r--r-- | www/index.html | 6 | ||||
| -rw-r--r-- | www/js/HelpCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/app.js | 18 | ||||
| -rw-r--r-- | www/templates/help.html | 24 | ||||
| -rw-r--r-- | www/templates/montage.html | 12 |
6 files changed, 46 insertions, 20 deletions
diff --git a/www/index.html b/www/index.html index 654e9378..1cafc86f 100644 --- a/www/index.html +++ b/www/index.html @@ -27,6 +27,7 @@ <link rel="stylesheet" href="external/radio.css"> <link rel="stylesheet" href="lib/ion-datetime-picker/release/ion-datetime-picker.min.css"> + @@ -100,11 +101,12 @@ <script src="js/MontageHistoryCtrl.js"></script> <script src="js/NewsCtrl.js"></script> <script src="lib/ion-datetime-picker/release/ion-datetime-picker.min.js"></script> + <script src="external/ng-websocket.js"></script> <script src="external/uri.min.js"></script> - + <script src="lib/vis/dist/vis.js"></script> @@ -121,8 +123,6 @@ <script src="lib/ionic-content-banner/dist/ionic.content.banner.min.js"></script> <script src="external/FileSaver.min.js"></script> <script src="external/canvas-toBlob.js"></script> - - </head> diff --git a/www/js/HelpCtrl.js b/www/js/HelpCtrl.js index b7cad31a..85a7e45e 100644 --- a/www/js/HelpCtrl.js +++ b/www/js/HelpCtrl.js @@ -1,6 +1,6 @@ /* jshint -W041 */ /* jslint browser: true*/ -/* global cordova,StatusBar,angular,console */ +/* global cordova,StatusBar,angular,console, Masonry */ angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$rootScope', '$ionicModal', 'ZMDataModel','$ionicSideMenuDelegate', '$ionicHistory', '$state', function ($scope, $rootScope, $ionicModal, ZMDataModel,$ionicSideMenuDelegate, $ionicHistory, $state) { $scope.openMenu = function () { @@ -34,6 +34,8 @@ $scope.openMenu = function () { console.log("**VIEW ** Help Ctrl Entered"); ZMDataModel.setAwake(false); + + }); }]); diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 31a932c9..11f47063 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -396,7 +396,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc $scope.MontageMonitors[ndx].eventUrlTime=data.event.Event.StartTime; $scope.MontageMonitors[ndx].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.event.Event.Id+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single"); - },300); + },700); } diff --git a/www/js/app.js b/www/js/app.js index 6f9f7e34..216441d9 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -334,6 +334,12 @@ angular.module('zmApp', [ if (zmCookie) { config.headers.Cookie = "ZMSESSID=" + zmCookie; } + + else + { + // console.log ("No cookie present in " + config.url); + } + if ((config.url.indexOf("/api/states/change/") > -1) || (config.url.indexOf("getDiskPercent.json") > -1) || (config.url.indexOf("daemonCheck.json") > -1) || @@ -358,7 +364,8 @@ angular.module('zmApp', [ if (zmSess) { if (zmSess[1]) { - + + // console.log ("***** SETTING COOKIE TO " + zmCookie); zmCookie = zmSess[1]; } } @@ -596,13 +603,20 @@ angular.module('zmApp', [ title: 'reCaptcha enabled', template: 'Looks like you have enabled reCaptcha. It needs to be turned off for zmNinja to work' }); + + // close it after 5 seconds $timeout(function () { alertPopup.close(); }, 5000); + + d.reject ("Error-disable recaptcha"); + return (d.promise); } + + }); @@ -662,9 +676,11 @@ angular.module('zmApp', [ $rootScope.$emit('auth-error', "incorrect credentials"); d.reject("Login Error"); + return (d.promise); } // Now go ahead and re-get auth key + // if login was a success $rootScope.authSession = "undefined"; var ld = ZMDataModel.getLogin(); ZMDataModel.getAuthKey($rootScope.validMonitorId) diff --git a/www/templates/help.html b/www/templates/help.html index 9621ca9b..12a185f2 100644 --- a/www/templates/help.html +++ b/www/templates/help.html @@ -2,15 +2,17 @@ <ion-nav-buttons side="left"> <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> - + <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button> - + </ion-nav-buttons> <ion-content class="padding"> + + <div class="list"> - + <ion-item class="item-text-wrap"> <h2><b>Is there an official FAQ?</b> </h2>There sure is. Always check <a href="#" onclick="window.open('https://github.com/pliablepixels/zmNinja/wiki/FAQ', '_blank', 'location=yes'); return false;">here</a> for the most updated help </ion-item> @@ -19,9 +21,15 @@ <h2><b> What do I enter for ZM Portal URL, Base path to cgi-bin and ZM API URL?</b> </h2> <ul> - <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 path: The URL using which your cgi-bin path is accessible<p>(example http://myserver.ddns.net/zm/cgi-bin).</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> + <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 path: The URL using which your cgi-bin path is accessible + <p>(example http://myserver.ddns.net/zm/cgi-bin).</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> @@ -34,7 +42,7 @@ <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 class="item-text-wrap"> <h2> <b>Everything works! but live streaming does not </b></h2> Check if streaming works in the web interface. If it does not work, zmNinja won't work either. Fix ZM first. If streaming in ZM works, go to zmNinja settings and fix your cgi-bin path. the automatic path that is filled in won't work. Here is a hint, go to zoneminder->options->paths and check the value of the cgi-bin path - your zmNinja path will be "base path of your server" + cgi-bin path. </ion-item> @@ -87,4 +95,4 @@ </ion-content> -</ion-view> +</ion-view>
\ No newline at end of file diff --git a/www/templates/montage.html b/www/templates/montage.html index 5c14fa88..1737e0d7 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -31,7 +31,7 @@ <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 style="color:#bbbbbb" class="icon ion-image"></i> @@ -41,9 +41,9 @@ </div> </span> - - - + + + <div ng-style="packMontage ? { '-webkit-column-count':slider.monsize,'-webkit-column-gap':'0px','line-height':'0px','-webkit-column-fill': 'balance', 'column-fill': 'balance'} : {'-webkit-column-count':slider.monsize,'-webkit-column-gap':'0px','line-height':'0px','display':'-webkit-flex','-webkit-flex-direction':'row','flex-direction':'row', 'flex-wrap':'wrap' }"> <!--<div ng-style="packMontage ? { '-webkit-column-count':slider.monsize, '-webkit-column-gap':'0px','line-height':'0px' } : { 'flex':'display', '-webkit-column-count':slider.monsize }">--> @@ -97,7 +97,7 @@ <div ng-if="isModalActive"> - <img image-spinner-src="img/pausevideo.png" style="margin-top:0px; + <img image-spinner-src="img/pausevideo.png" style="margin-top:0px; width: 100% !important; height: auto !important;" /> </div> @@ -106,7 +106,7 @@ </span> </div> - + <!-- ngrepeat --> |