diff options
| author | Simon Rettberg | 2021-09-30 17:44:30 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2021-09-30 17:44:30 +0200 |
| commit | c77d4b13c71a8e23becb5f935b8e880ac8497520 (patch) | |
| tree | 017045f2b6cd7a2300a632f28343fb12b7b948cc /modules-available/statistics/templates/machine-main.html | |
| parent | [statistics] Hints (diff) | |
| download | slx-admin-c77d4b13c71a8e23becb5f935b8e880ac8497520.tar.gz slx-admin-c77d4b13c71a8e23becb5f935b8e880ac8497520.tar.xz slx-admin-c77d4b13c71a8e23becb5f935b8e880ac8497520.zip | |
[statistics] Adapt hw-data parsing to new json format for display
Diffstat (limited to 'modules-available/statistics/templates/machine-main.html')
| -rw-r--r-- | modules-available/statistics/templates/machine-main.html | 67 |
1 files changed, 44 insertions, 23 deletions
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index 568099e0..29d63a73 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -220,11 +220,11 @@ <td class="text-nowrap">{{lang_cpuModel}}</td> <td> {{cpumodel}} - {{#Sockets}} + {{#cpu.sockets}} <div class="small"> - {{lang_sockets}}: {{Sockets}}, {{lang_cores}}: {{Realcores}}, {{lang_virtualCores}}: {{Virtualcores}} + {{lang_sockets}}: {{cpu.sockets}}, {{lang_cores}}: {{cpu.cores}}, {{lang_virtualCores}}: {{cpu.threads}} </div> - {{/Sockets}} + {{/cpu.sockets}} {{#live_cpuload_s}} <div class="meter"> <div class="text left">{{lang_cpuload}}</div> @@ -243,13 +243,12 @@ </tr> <tr> <td class="text-nowrap">{{lang_pcmodel}}</td> - <td>{{pcmodel}} ({{pcmanufacturer}})</td> + <td>{{system.Product Name}} ({{system.Manufacturer}})</td> </tr> <tr> <td class="text-nowrap">{{lang_mobomodel}}</td> - <td>{{mobomodel}} ({{mobomanufacturer}})</td> + <td>{{mainboard.Product Name}} ({{mainboard.Manufacturer}})</td> </tr> - {{#biosdate}} <tr> <td class="text-nowrap"> <div>{{lang_biosVersion}}</div> @@ -257,19 +256,23 @@ </td> <td class="text-nowrap"> <div id="bios-panel" class="pull-right"style="max-width:30%">{{{bioshtml}}}</div> - <div>{{biosversion}} (<b>{{biosrevision}}</b>)</div> - <div>{{biosdate}}</div> + <div>{{bios.Version}} (<b>{{bios.BIOS Revision}}</b>)</div> + <div>{{bios.Release Date}}</div> </td> </tr> - {{/biosdate}} <tr class="{{ramclass}}"> <td class="text-nowrap">{{lang_ram}}</td> <td> <div> {{gbram}} GiB - {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}} - {{ramtype}} + {{#Memory Maximum Capacity}} + / {{lang_maximumAbbrev}} {{Memory Maximum Capacity}} + {{/Memory Maximum Capacity}} + {{#Memory Slot Count}} + ({{Memory Slot Count}} {{lang_slots}}) + {{/Memory Slot Count}} </div> + <div>{{ramtype}}</div> {{#live_memsize}} <div class="meter"> <div class="text left">{{lang_ram}}</div> @@ -286,17 +289,27 @@ {{/live_swapsize}} </td> </tr> - {{#extram}} <tr> - <td class="text-nowrap">{{lang_ramSlots}}</td> - <td> - {{ramslotcount}}: - {{#ramslot}} - [ <span title="{{manuf}}">{{size}}</span> ] - {{/ramslot}} + <td colspan="2"> + <table class="table-responsive slx-table text-nowrap"> + {{#ram}} + {{#Speed}} + <tr> + <td> + {{Locator}}, + {{Bank Locator}} + {{^Bank Locator}}Set {{Set}}{{/Bank Locator}} + </td> + <td class="slx-bold">{{Size}}</td> + <td>{{#Configured Speed}}{{Configured Speed}} / {{/Configured Speed}}{{Speed}}</td> + <td>{{Manufacturer}}</td> + <td>{{Serial Number}}</td> + </tr> + {{/Speed}} + {{/ram}} + </table> </td> </tr> - {{/extram}} <tr class="{{hddclass}}"> <td class="text-nowrap">{{lang_tempPart}}</td> <td> @@ -304,11 +317,19 @@ {{gbtmp}} GiB </div> {{#live_tmpsize}} - <div class="meter"> - <div class="text right">{{live_tmpfree_s}} {{lang_free}}</div> - <div class="bar" style="width:{{live_tmppercent}}%"></div> - </div> + <div class="meter"> + <div class="text right">{{live_tmpfree_s}} {{lang_free}}</div> + <div class="bar" style="width:{{live_tmppercent}}%"></div> + </div> {{/live_tmpsize}} + </td> + </tr> + <tr> + <td class="text-nowrap">{{lang_persistentPart}}</td> + <td> + <div> + {{gbid45}} GiB + </div> {{#live_id45size}} <div class="meter"> <div class="text right">{{live_id45free_s}} {{lang_free}}</div> |