diff --git a/glances/outputs/bottle/index.html b/glances/outputs/bottle/index.html index 4dccc9d4..2dba116b 100644 --- a/glances/outputs/bottle/index.html +++ b/glances/outputs/bottle/index.html @@ -2,241 +2,231 @@ - - -Glances - - - - - - + + + Glances + + + + + + -
Loading...
-
-
-
-
+
Loading...
+
+
+
+
+
+ Refresh time  {{result["system"].hostname}}  +
+
+
+
+ Uptime: {{result["uptime"]}} +
+
+
+
-
- Refresh time  {{result["system"].hostname}}  -
+
+
+
+
+
+
CPU
+
{{result["cpu"].total}}%
+
+
+
user:
+
+ {{result["cpu"].user}}% +
+
+
+
system:
+
+ {{result["cpu"].system}}% +
+
+
+
idle:
+
{{result["cpu"].idle}}%
+
+
+
+
+
+
+
+
+
+
MEM
+
{{result["mem"].percent}}%
+
+
+
total:
+
{{result["mem"].total | bytes:2}}
+
+
+
used:
+
+ {{result["mem"].used | bytes:2}} +
+
+
+
free:
+
{{result["mem"].free | bytes:2}}
+
+
+
+
+
+
+
+
+
SWAP
+
{{result["memswap"].percent}}%
+
+
+
total:
+
{{result["memswap"].total | bytes:2}}
+
+
+
used:
+
+ {{result["memswap"].used | bytes:2}} +
+
+
+
free:
+
{{result["memswap"].free | bytes:2}}
+
+
+
+
+
+
+
+
+
+
+
NETWORK
+
Rx/s
+
Tx/s
+
+
+
{{network.interface_name | min_size}}
+
{{network.rx | bytes}}
+
{{network.tx | bytes}}
+
+
+
-
-
-
- Uptime: {{result["uptime"]}} -
-
-
-
+
+
+
+
DISK I/O
+
R/s
+
W/s
+
+
+
{{disk.disk_name | min_size}}
+
{{disk.read_bytes | bytes}}
+
{{disk.write_bytes | bytes}}
+
+
+
+
+
+
+
FILE SYS
+
Used
+
Total
+
+
+
{{fs.mnt_point}} ({{fs.device_name}})
+
+ {{fs.size - fs.free | bytes}} +
+
{{fs.size | bytes}}
+
+
+
+ +
+
+
+
+
+
No warning or critical alert detected
+
{{alert}}
+
+
+
-
-
-
- - - - - - - - - - - - - - - - - - - -
CPU{{result["cpu"].total}}%
user:{{result["cpu"].user}}%
system:{{result["cpu"].system}}%
idle:{{result["cpu"].idle}}%
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - -
MEM{{result["mem"].percent}}%
total:{{result["mem"].total | bytes:2}}
used:{{result["mem"].used | bytes:2}}
free:{{result["mem"].free | bytes:2}}
-
-
-
-
- - - - - - - - - - - - - - - - - - - -
SWAP{{result["memswap"].percent}}%
total:{{result["memswap"].total | bytes:2}}
used:{{result["memswap"].used | bytes:2}}
free:{{result["memswap"].free | bytes:2}}
-
-
-
-
-
-
- - - - - - - - - - - - - -
NETWORKRx/sTx/s
{{network.interface_name | min_size}}}{{network.rx | bytes}}{{network.tx | bytes}}
-
+
+ TASKS {{result["processcount"].total}} ({{result["processcount"].thread}} thr), {{result["processcount"].running}} run, + {{result["processcount"].sleeping}} slp, {{result["processcount"].stopped}} oth sorted automatically by cpu_percent, flat view +
-
- - - - - - - - - - - - - -
DISK I/OR/sW/s
{{disk.disk_name | min_size}}{{disk.read_bytes | bytes}}{{disk.write_bytes | bytes}}
-
-
- - - - - - - - - - - - - -
FILE SYSUsedTotal
{{fs.mnt_point}} ({{fs.device_name}}){{fs.size - fs.free | bytes}}{{fs.size | bytes}}
-
- -
-
-
- - - - - - - -
No warning or critical alert detected{{alert}}
-
+
+
+
-
- TASKS {{result["processcount"].total}} ({{result["processcount"].thread}} thr), {{result["processcount"].running}} run, - {{result["processcount"].sleeping}} slp, {{result["processcount"].stopped}} oth sorted automatically by cpu_percent, flat view -
+ -
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CPU%MEM%PIDUSERNISCommand
{{process.cpu_percent | number:1}}{{process.memory_percent | number:1}}{{process.pid}}{{process.username}}{{process.nice | exclamation}}{{process.status}}{{process.name}}
-
-
-
-
+
+
+
+
CPU%
+
MEM%
+
VIRT
+
RES
+
PID
+
USER
+
NI
+
S
+
TIME+
+
IOR/s
+
IOW/s
+
Command
+
+
+
{{process.cpu_percent | number:1}}
+
{{process.memory_percent | number:1}}
+ + +
{{process.pid}}
+
{{process.username}}
+
{{process.nice | exclamation}}
+
{{process.status}}
+ + + +
{{process.name}}
+
+
+
+
+
+
diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index 5cccb68d..b0508430 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -277,6 +277,7 @@ class GlancesBottle(object): f = open(path) return f.read() + class EnableCors(object): name = 'enable_cors' api = 2 diff --git a/glances/outputs/static/css/style.css b/glances/outputs/static/css/style.css index 3fcd08d5..cca59ef4 100644 --- a/glances/outputs/static/css/style.css +++ b/glances/outputs/static/css/style.css @@ -3,16 +3,23 @@ body { color: #BBB; font-family: "Lucida Sans Typewriter", "Lucida Console", Monaco, "Bitstream Vera Sans Mono", monospace; } -.plugin { - margin-bottom: 20px; -} -.plugin table { + +.table { + display: table; width: 100%; } -.plugin table tr td:not(:first-child) { +.table-row { + display: table-row; +} +.table-cell { + display: table-cell; text-align: right; } +.plugin { + margin-bottom: 20px; +} + .underline{ text-decoration: underline } @@ -28,6 +35,9 @@ body { .text-right { text-align: right; } +.text-left { + text-align: left; +} /* Theme */ @@ -77,18 +87,7 @@ body { } /* Plugins */ -#cpu table tr td:nth-child(3), -#mem table tr td:nth-child(3), -#monitor table tr td:nth-child(3) { - text-align: left; - padding-left: 20px; -} -#processlist table tr td { +#processlist .table-cell { padding: 0px 5px 0px 5px; white-space: nowrap; - text-align: right; -} -#processlist table tr td:nth-child(6), -#processlist table tr td:nth-child(12) { - text-align: left; } \ No newline at end of file