diff options
author | Simon Rettberg | 2019-02-12 14:55:49 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-12 14:55:49 +0100 |
commit | ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9 (patch) | |
tree | 0134ad4e33aa259250fb46a82e7da44b091db88e /modules-available/statistics/templates | |
parent | [serversetup*] PXELinux and iPXE side-by-side (diff) | |
parent | [inc/Dictionary] Teh evil unvalidated redirects must die! (diff) | |
download | slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.tar.gz slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.tar.xz slx-admin-ec4ac82adaabe55cb9c3c40fad66d3451cb5f4d9.zip |
Merge branch 'master' into ipxeipxe
Diffstat (limited to 'modules-available/statistics/templates')
-rw-r--r-- | modules-available/statistics/templates/filterbox.html | 5 | ||||
-rw-r--r-- | modules-available/statistics/templates/machine-main.html | 32 |
2 files changed, 32 insertions, 5 deletions
diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html index cd8ec24d..07aa7320 100644 --- a/modules-available/statistics/templates/filterbox.html +++ b/modules-available/statistics/templates/filterbox.html @@ -101,7 +101,10 @@ var slxFilterNames = { currentuser: '{{lang_currentUser}}', subnet: '{{lang_subnet}}', runtime: '{{lang_runtimeHours}}', - hostname: '{{lang_hostname}}' + hostname: '{{lang_hostname}}', + live_swapfree: '{{lang_swapFree}}', + live_memfree: '{{lang_memFree}}', + live_tmpfree: '{{lang_tmpFree}}' }; slxLocations = {{{locations}}}; diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index f1021482..44f03a99 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -117,9 +117,23 @@ <tr class="{{ramclass}}"> <td class="text-nowrap">{{lang_ram}}</td> <td> - {{gbram}} GiB - {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}} - {{ramtype}} + <div> + {{gbram}} GiB + {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}} + {{ramtype}} + </div> + {{#live_memsize}} + <div class="meter"> + <div class="text">{{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="bar" style="width:{{live_swappercent}}%"></div> + </div> + {{/live_swapsize}} </td> </tr> {{#extram}} @@ -135,7 +149,17 @@ {{/extram}} <tr class="{{hddclass}}"> <td class="text-nowrap">{{lang_tempPart}}</td> - <td>{{gbtmp}} GiB</td> + <td> + <div> + {{gbtmp}} GiB + </div> + {{#live_tmpsize}} + <div class="meter"> + <div class="text">{{live_tmpfree_s}} {{lang_free}}</div> + <div class="bar" style="width:{{live_tmppercent}}%"></div> + </div> + {{/live_tmpsize}} + </td> </tr> <tr class="{{kvmclass}}"> <td class="text-nowrap">{{lang_64bitSupport}}</td> |