diff options
| -rw-r--r-- | ionic.config.json | 3 | ||||
| -rw-r--r-- | ionic.project.desktop | 25 | ||||
| -rwxr-xr-x | make_desktop.sh | 2 | ||||
| -rw-r--r-- | www/css/style.css | 4 | ||||
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/EventDateTimeFilterCtrl.js | 8 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 4 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 1 | ||||
| -rw-r--r-- | www/templates/zm-portal-login.html | 2 |
9 files changed, 22 insertions, 29 deletions
diff --git a/ionic.config.json b/ionic.config.json index 40dc6930..9ea31b20 100644 --- a/ionic.config.json +++ b/ionic.config.json @@ -1,10 +1,11 @@ { "name": "zmNinja", "app_id": "8f73ad5f", + "defaultBrowser": "google chrome", "proxies": [ { "path": "/zm", - "proxyUrl": "", + "proxyUrl": "http://server/zm", "rejectUnauthorized": false } ], diff --git a/ionic.project.desktop b/ionic.project.desktop deleted file mode 100644 index bad49608..00000000 --- a/ionic.project.desktop +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "zmNinja", - "app_id": "8f73ad5f", - "proxies": [ - { - "path": "/zm", - "proxyUrl": "http://server/zm", - "rejectUnauthorized" : false - }], - "browsers": [ - { - "platform": "android", - "browser": "crosswalk", - "version": "12.41.296.5" - } - ], - "gulpStartupTasks": [ - "sass", - "watch" - ], - "watchPatterns": [ - "www/**/*", - "!www/lib/**/*" - ] -} diff --git a/make_desktop.sh b/make_desktop.sh index 3fe6fb5a..8f7750a4 100755 --- a/make_desktop.sh +++ b/make_desktop.sh @@ -24,7 +24,7 @@ if [ -d "$i" ]; then echo "------------------------------------------------------------------------" exe rm -fr $i/app exe mkdir $i/app - exe cp -R www/ $i/app + exe cp -R www/* $i/app/ exe cp electron_js/* $i/app exe cp www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt ../$DIRNAME exe cd $i diff --git a/www/css/style.css b/www/css/style.css index 9fb19658..33e6f972 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -701,6 +701,10 @@ input[type=range]::-webkit-slider-thumb { -webkit-animation-delay: 1s; } +#really-your-fault { + -webkit-animation-delay: 4s; +} + /* packery stuff */ * { box-sizing: border-box; diff --git a/www/js/DataModel.js b/www/js/DataModel.js index be6aa43b..16b33431 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -987,7 +987,7 @@ angular.module('zmApp.controllers') var apiurl = loginData.apiurl + '/host/getVersion.json'; $http.get(apiurl) .then(function (success) { - if (success.data.version) { + if ( success.data.version) { d.resolve(success.data.version); } else { d.resolve("0.0.0"); diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js index 3c9bcb8a..f9e982f5 100644 --- a/www/js/EventDateTimeFilterCtrl.js +++ b/www/js/EventDateTimeFilterCtrl.js @@ -88,6 +88,14 @@ angular.module('zmApp.controllers') } + if ($rootScope.fromDate > $rootScope.toDate) + { + NVRDataModel.log ("From date > To Date, swapping"); + var t = $rootScope.fromDate; + $rootScope.fromDate = $rootScope.toDate; + $rootScope.toDate = t; + } + $rootScope.isEventFilterOn = true; $rootScope.fromString = moment($rootScope.fromDate).format("YYYY-MM-DD") + " " + moment($rootScope.fromTime).format("HH:mm:ss"); diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index ec9d345a..7e874fa4 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -234,8 +234,10 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic NVRDataModel.debug("logging state transition"); NVRDataModel.debug("Transitioning state to: " + statetoGo + " with param " + JSON.stringify($rootScope.lastStateParam)); + + $state.go(statetoGo, $rootScope.lastStateParam); - + }, function (error) { // API Error NVRDataModel.log("API Error handler: going to login getAPI returned error: " + JSON.stringify(error)); diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index b253b6cf..995aa926 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -209,6 +209,7 @@ "kOnlyUseWebSocket" :"only use websockets", "kOperationInProgressBody" :"The previous operation is still in progress. Please wait", "kOperationInProgressTitle" :"Operation in Progress", + "kPortalNotice" :"If this screen doesn't go away after a while, you have not setup ZoneMinder and/or the APIs correctly", "kPTZ" :"pan/tilt/zoom", "kPTZNotReady" :"Not ready for PTZ", "kPTZnotConfigured" :"PTZ not configured for this monitor", diff --git a/www/templates/zm-portal-login.html b/www/templates/zm-portal-login.html index 21fef789..90c068da 100644 --- a/www/templates/zm-portal-login.html +++ b/www/templates/zm-portal-login.html @@ -23,6 +23,8 @@ <button class="button button-dark icon ion-unlocked" ng-click="unlock()"> Unlock </button> </div> + <div id = "really-your-fault" class="animated fadeIn" style="color:white">{{'kPortalNotice' | translate}}</div> + </center> </div> |