diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/LogCtrl.js | 5 | ||||
| -rw-r--r-- | www/templates/log.html | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js index 599c63d1..01566750 100644 --- a/www/js/LogCtrl.js +++ b/www/js/LogCtrl.js @@ -70,7 +70,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo $scope.downloadLogs = function () { var body = "zmNinja version:" + $scope.zmAppVersion + " (" + $rootScope.platformOS + ")\n" + - "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion(); + "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion()+"\n\n"; body = $translate.instant('kSensitiveBody') + '\n\n\n' + body; var fname = $rootScope.appName + "-logs-" + @@ -107,7 +107,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo $scope.attachLogs = function () { var body = "zmNinja version:" + $scope.zmAppVersion + " (" + $rootScope.platformOS + ")<br/>" + - "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion(); + "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion() + "<br/>"; body = '<b>' + $translate.instant('kSensitiveBody') + '</b><br/><br/>' + body; $fileLogger.checkFile() @@ -254,6 +254,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo }; $scope.zmAppVersion = NVRDataModel.getAppVersion(); + $scope.zmVersion = NVRDataModel.getCurrentServerVersion(); /* intervalLogUpdateHandle = $interval(function () { diff --git a/www/templates/log.html b/www/templates/log.html index 99de95d3..2884c4bb 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -34,14 +34,14 @@ <button class="button button-small button-stable icon ion-chevron-left" ng-click="changePage(1)"> </button> <button class="button button-small button-stable icon ion-chevron-right" ng-click="changePage(-1)"> - </button> - - + </button><br/> + <b>ZoneMinder {{'kVersion'|translate}}: {{zmVersion}} </b><br/> </div> <div ng-if="logEntity==$root.appName"> - <b>{{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}})</b> + <b>{{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}})</b><br/> + <b>ZoneMinder {{'kVersion'|translate}}: {{zmVersion}} </b> </div> <div ng-if="selectOn" class="aside-1">{{'kLogsCopyPaste' | translate }}</div> |