diff options
| author | Simon Rettberg | 2019-04-29 10:02:08 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-05-23 12:19:33 +0200 |
| commit | 9e5028536d269b8b21a5bad10e58c4eb152daeae (patch) | |
| tree | 915b7fa7e1c22f34a75211422eee0462efa11c69 | |
| parent | [roomplanner] Make highlight green, not red (diff) | |
| download | slx-admin-9e5028536d269b8b21a5bad10e58c4eb152daeae.tar.gz slx-admin-9e5028536d269b8b21a5bad10e58c4eb152daeae.tar.xz slx-admin-9e5028536d269b8b21a5bad10e58c4eb152daeae.zip | |
[statistics] Add captions to RAM/swap bar
| -rw-r--r-- | modules-available/statistics/style.css | 9 | ||||
| -rw-r--r-- | modules-available/statistics/templates/machine-main.html | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/modules-available/statistics/style.css b/modules-available/statistics/style.css index dffe973b..1bfc2893 100644 --- a/modules-available/statistics/style.css +++ b/modules-available/statistics/style.css @@ -34,7 +34,6 @@ .meter .text { position: absolute; - right: 5px; overflow: visible; font-size: 8pt; white-space: nowrap; @@ -42,6 +41,14 @@ text-shadow: #fff 1px 1px; } +.meter .left { + left: 5px; +} + +.meter .right { + right: 5px; +} + .warn { background: #F0AD4E; font-size: 75%; diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index 12f1d4c5..6052141c 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -229,13 +229,15 @@ </div> {{#live_memsize}} <div class="meter"> - <div class="text">{{live_memfree_s}} {{lang_free}}</div> + <div class="text left">{{lang_ram}}</div> + <div class="text right">{{live_memfree_s}} {{lang_free}}</div> <div class="bar" style="width:{{live_mempercent}}%"></div> </div> {{/live_memsize}} {{#live_swapsize}} <div class="meter"> - <div class="text">{{live_swapfree_s}} {{lang_free}}</div> + <div class="text left">{{lang_swap}}</div> + <div class="text right">{{live_swapfree_s}} {{lang_free}}</div> <div class="bar" style="width:{{live_swappercent}}%"></div> </div> {{/live_swapsize}} @@ -260,7 +262,7 @@ </div> {{#live_tmpsize}} <div class="meter"> - <div class="text">{{live_tmpfree_s}} {{lang_free}}</div> + <div class="text right">{{live_tmpfree_s}} {{lang_free}}</div> <div class="bar" style="width:{{live_tmppercent}}%"></div> </div> {{/live_tmpsize}} |