diff --git a/glances/outputs/static/js/components/plugin-folders/view.html b/glances/outputs/static/js/components/plugin-folders/view.html index 4308ff58..26e984e4 100644 --- a/glances/outputs/static/js/components/plugin-folders/view.html +++ b/glances/outputs/static/js/components/plugin-folders/view.html @@ -1,8 +1,10 @@
FOLDERS
+
Size
{{ folder.path }}
+
{{ folder.size | bytes }}
diff --git a/glances/outputs/static/js/components/plugin-ports/controller.js b/glances/outputs/static/js/components/plugin-ports/controller.js index ec6725c5..326f245e 100644 --- a/glances/outputs/static/js/components/plugin-ports/controller.js +++ b/glances/outputs/static/js/components/plugin-ports/controller.js @@ -20,16 +20,26 @@ export default function GlancesPluginPortsController($scope, GlancesStats) { }, this); } - vm.getDecoration = function (port) { + vm.getPortDecoration = function (port) { if (port.status === null) { return 'careful'; - } - - if (port.status === false) { + } else if (port.status === false) { return 'critical'; + } else if (port.rtt_warning !== null && port.status > port.rtt_warning) { + return 'warning'; } - if (port.rtt_warning !== null && port.status > port.rtt_warning) { + return 'ok'; + }; + + vm.getWebDecoration = function (web) { + var okCodes = [200, 301, 302]; + + if (web.status === null) { + return 'careful'; + } else if (okCodes.indexOf(web.status) === -1) { + return 'critical'; + } else if (web.rtt_warning !== null && web.elapsed > web.rtt_warning) { return 'warning'; } diff --git a/glances/outputs/static/js/components/plugin-ports/view.html b/glances/outputs/static/js/components/plugin-ports/view.html index 560886a2..3af369bd 100644 --- a/glances/outputs/static/js/components/plugin-ports/view.html +++ b/glances/outputs/static/js/components/plugin-ports/view.html @@ -3,10 +3,15 @@ 20}}
-
+
Scanning Timeout Open {{port.status * 1000.0 | number:0}}ms
+
+ Scanning + Error + Code {{ port.status }} +
\ No newline at end of file diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index 2a2d8f9d..2b5a1b67 100644 Binary files a/glances/outputs/static/public/glances.js and b/glances/outputs/static/public/glances.js differ diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js index 3fe041df..3c256e9b 100644 Binary files a/glances/outputs/static/public/glances.map.js and b/glances/outputs/static/public/glances.map.js differ