diff options
author | root | 2019-02-19 18:53:50 +0100 |
---|---|---|
committer | root | 2019-02-19 18:53:50 +0100 |
commit | 0ad4c0f8196b61699754762aacbaab0223478ab9 (patch) | |
tree | de434c4aea8d07ecd01cd3badd48d057d62c2d1b /modules-available/statistics/templates/machine-main.html | |
parent | [usb-lock-off] Edit rule cleanup and fix of the dropdown boxes. (diff) | |
parent | [statistics] Fix RAM change warning to handle increase too (diff) | |
download | slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.gz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.xz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.zip |
Merge branch 'master' into usb-lock-offusb-lock-off
Diffstat (limited to 'modules-available/statistics/templates/machine-main.html')
-rw-r--r-- | modules-available/statistics/templates/machine-main.html | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index d8f2c521..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> @@ -157,13 +181,19 @@ {{#hwname}} <div class="pull-right btn-group btn-group-xs"> {{#projector}} - <a href="?do=statistics&show=projectors" class="btn btn-default">{{lang_projector}}</a> + <a href="?do=statistics&show=projectors" class="btn btn-default {{perms.hardware.projectors.view.disabled}}"> + {{lang_projector}} + </a> <button form="delprojector" type="submit" name="hwid" value="{{hwid}}" - class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button> + class="btn btn-danger" {{perms.hardware.projectors.edit.disabled}}> + <span class="glyphicon glyphicon-remove"></span> + </button> {{/projector}} {{^projector}} <button form="addprojector" type="submit" name="hwid" value="{{hwid}}" - class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> {{lang_projector}}</button> + class="btn btn-success" {{perms.hardware.projectors.edit.disabled}}> + <span class="glyphicon glyphicon-plus"></span> {{lang_projector}} + </button> {{/projector}} </div> {{/hwname}} |