diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-21 09:31:05 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-21 09:31:05 -0400 |
| commit | 846977faa53afb9390f7491880fde484afc3fe6b (patch) | |
| tree | 4c3de1d9435d5d0613b8c9b42ed501a968aa90cc | |
| parent | 8490d20a5f8cc7e6209bdd5736edadd959530ef2 (diff) | |
#353 - display server time zone
Former-commit-id: 444e179d5c12d1bbdafbb0f6cd5da70bd1254a76
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 5 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 4 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 2fc9115b..984b59cc 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -60,6 +60,11 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' { return NVRDataModel.isTzSupported(); }; + + $scope.getTimeZoneNow = function() + { + return NVRDataModel.getTimeZoneNow(); + }; //------------------------------------------------------------------ // Perform the login action when the user submits the login form diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index e4cdf846..67ec3577 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -363,6 +363,8 @@ "kEventHistFaster" : "faster", "kEventHistPlay" : "play", "kEventHistPause" : "pause", - "kLocalTimeZone" :"convert to local timezone" + "kLocalTimeZone" :"convert to local timezone", + "kTimeZoneNotSupported" : "your API doesn't support this", + "kServerTimeZone" : "server TZ" } diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index 6bb215fc..b0884da2 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -31,7 +31,7 @@ </label> <label> - <ion-toggle ng-model="loginData.useLocalTimeZone" ng-checked="{{loginData.useLocalTimeZone}}" ng-disabled="!isTzSupported()" toggle-class="toggle-calm">{{'kLocalTimeZone' | translate}}<span ng-if="!isTzSupported()"><p>your API doesn't support this</p></span></ion-toggle> + <ion-toggle ng-model="loginData.useLocalTimeZone" ng-checked="{{loginData.useLocalTimeZone}}" ng-disabled="!isTzSupported()" toggle-class="toggle-calm">{{'kLocalTimeZone' | translate}}<span ng-if="!isTzSupported()"><p>{{'kTimeZoneNotSupported' | translate}}</p></span><span ng-if="isTzSupported()"><p>{{'kServerTimeZone' | translate}}:{{getTimeZoneNow()}}</p></span></ion-toggle> </label> <div ng-if="$root.platformOS=='android'"> |