diff --git a/glances/outputs/static/html/plugins/processlist.html b/glances/outputs/static/html/plugins/processlist.html index 03688839..6b1e7bb6 100644 --- a/glances/outputs/static/html/plugins/processlist.html +++ b/glances/outputs/static/html/plugins/processlist.html @@ -20,7 +20,7 @@
{{process.pid}}
{{process.username}}
-
{{process.nice | exclamation}}
+
{{process.nice | exclamation}}
{{process.status}}
diff --git a/glances/outputs/static/html/plugins/system.html b/glances/outputs/static/html/plugins/system.html index 60c6b2cd..05fb7cea 100644 --- a/glances/outputs/static/html/plugins/system.html +++ b/glances/outputs/static/html/plugins/system.html @@ -1,5 +1,5 @@ {{ result["system"].hostname }} - - + + diff --git a/glances/outputs/static/js/stats_controller.js b/glances/outputs/static/js/stats_controller.js index 5c774691..aacc0e2f 100644 --- a/glances/outputs/static/js/stats_controller.js +++ b/glances/outputs/static/js/stats_controller.js @@ -149,6 +149,12 @@ glancesApp.controller('statsController', function($scope, $http, $interval, $q, alert.duration = durationBetweenTwoDates(alert.begin, alert.end); } } + + $scope.is_bsd = response['system'].os_name === 'FreeBSD'; + $scope.is_linux = response['system'].os_name === 'Linux'; + $scope.is_mac = response['system'].os_name === 'Darwin'; + $scope.is_windows = response['system'].os_name === 'Windows'; + $scope.result = response; canceler.resolve() }).error(function(d, status, headers, config) { @@ -157,6 +163,14 @@ glancesApp.controller('statsController', function($scope, $http, $interval, $q, }); } + $scope.isNice = function(nice) { + if(nice !== undefined && (($scope.is_windows && nice != 32) || (!$scope.is_windows && nice != 0))) { + return true; + } + + return false; + } + $scope.getClass = function(pluginName, limitNamePrefix, value, num) { if ($scope.pluginLimits != undefined && $scope.pluginLimits[pluginName] != undefined) { for (var i = 0; i < $scope.limitSuffix.length; i++) {