diff options
Diffstat (limited to 'www')
| -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 |
6 files changed, 19 insertions, 2 deletions
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> |