{{network.interface_name | min_size}}
{{network.rx | bytes}}
{{network.tx | bytes}}
diff --git a/glances/outputs/static/html/plugins/processlist.html b/glances/outputs/static/html/plugins/processlist.html
index 311a6a48af2b975f8f13f657593ca76ae566b871..036888396f0a5aaee81c18775062afb84e6f7111 100644
--- a/glances/outputs/static/html/plugins/processlist.html
+++ b/glances/outputs/static/html/plugins/processlist.html
@@ -16,8 +16,8 @@
{{process.cpu_percent | number:1}}
{{process.memory_percent | number:1}}
-
{{process.memvirt | bytes:1}}
-
{{process.memres | bytes:1}}
+
{{process.memvirt | bytes}}
+
{{process.memres | bytes}}
{{process.pid}}
{{process.username}}
{{process.nice | exclamation}}
diff --git a/glances/outputs/static/html/plugins/system.html b/glances/outputs/static/html/plugins/system.html
index 6066be0c48d46f33e3270ffc0396e8f70c2b5e2c..60c6b2cd96765aaebeaa701399e1b6f8be5762c0 100644
--- a/glances/outputs/static/html/plugins/system.html
+++ b/glances/outputs/static/html/plugins/system.html
@@ -1,6 +1,5 @@
-
-
-
{{result["system"].hostname}} ({{result["system"].hr_name}} / {{result["system"].os_name}} {{result["system"].os_version}})
+
+ {{ result["system"].hostname }}
+
+
({{ result["system"].hr_name }} / {{ result["system"].os_name }} {{ result["system"].os_version }})
+
({{ result["system"].os_name }} {{ result["system"].os_version }} {{ result["system"].platform }})
diff --git a/glances/outputs/static/html/stats.html b/glances/outputs/static/html/stats.html
index 6d5f64b78a52dac589b16503ac1617a51304d47d..0e9340ebbf3c1efb51ee9acc790e1b5dbbe86b46 100644
--- a/glances/outputs/static/html/stats.html
+++ b/glances/outputs/static/html/stats.html
@@ -12,7 +12,7 @@
-
+
diff --git a/glances/outputs/static/js/filters.js b/glances/outputs/static/js/filters.js
index 858763edda020d661b1511e1908c444918999f10..78472a24027fb6bd26f9410c106e29719dcf7080 100644
--- a/glances/outputs/static/js/filters.js
+++ b/glances/outputs/static/js/filters.js
@@ -16,29 +16,63 @@ glancesApp.filter('exclamation', function() {
};
});
-/**
- * Fork from https://gist.github.com/thomseddon/3511330
- * => \u00A0
- * WARNING : kilobyte (kB) != kibibyte (KiB) (more info here : http://en.wikipedia.org/wiki/Byte )
- **/
glancesApp.filter('bytes', function() {
- return function (bytes, precision) {
+ return function (bytes, low_precision) {
+ low_precision = low_precision || false;
if (isNaN(parseFloat(bytes)) || !isFinite(bytes) || bytes == 0){
- return '0B';
+ return '0';
}
- var units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'],
- number = Math.floor(Math.log(bytes) / Math.log(1000));
- return (bytes / Math.pow(1000, Math.floor(number))).toFixed(precision) + units[number];
+
+ var symbols = ['K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
+ var prefix = {
+ 'Y': 1208925819614629174706176,
+ 'Z': 1180591620717411303424,
+ 'E': 1152921504606846976,
+ 'P': 1125899906842624,
+ 'T': 1099511627776,
+ 'G': 1073741824,
+ 'M': 1048576,
+ 'K': 1024
+ };
+
+ var reverseSymbols = _(symbols).reverse().value();
+ for (var i = 0; i < reverseSymbols.length; i++) {
+ var symbol = reverseSymbols[i];
+ var value = bytes / prefix[symbol];
+
+ if(value > 1) {
+ var decimal_precision = 0;
+
+ if(value < 10) {
+ decimal_precision = 2;
+ }
+ else if(value < 100) {
+ decimal_precision = 1;
+ }
+
+ if(low_precision) {
+ if(symbol == 'MK') {
+ decimal_precision = 0;
+ }
+ else {
+ decimal_precision = _.min([1, decimal_precision]);
+ }
+ }
+ else if(symbol == 'K') {
+ decimal_precision = 0;
+ }
+
+ return parseFloat(value).toFixed(decimal_precision) + symbol;
+ }
+ }
+
+ return bytes;
}
});
-glancesApp.filter('bits', function() {
- return function (bits, precision) {
- if (isNaN(parseFloat(bits)) || !isFinite(bits) || bits == 0){
- return '0b';
- }
- var units = ['b', 'kb', 'Mb', 'Gb', 'Tb', 'Pb'],
- number = Math.floor(Math.log(bits) / Math.log(1000));
- return (bits / Math.pow(1000, Math.floor(number))).toFixed(precision) + units[number];
+glancesApp.filter('bits', function($filter) {
+ return function (bits, low_precision) {
+ bits = Math.round(bits) * 8;
+ return $filter('bytes')(bits, low_precision) + 'b';
}
});