diff options
Diffstat (limited to 'modules-available/statistics/templates/machine-main.html')
| -rw-r--r-- | modules-available/statistics/templates/machine-main.html | 155 |
1 files changed, 111 insertions, 44 deletions
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index 568099e0..be32f9c7 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -29,6 +29,12 @@ <td class="text-nowrap">{{lang_ip}}</td> <td>{{clientip}}</td> </tr> + {{#nic-speed}} + <tr> + <td class="text-nowrap">{{lang_nicSpeed}}</td> + <td>{{nic-speed}} MBit/s, {{lang_duplex}}: {{nic-duplex}}</td> + </tr> + {{/nic-speed}} {{#hostname}} <tr> <td class="text-nowrap">{{lang_hostname}}</td> @@ -41,7 +47,17 @@ </tr> <tr> <td class="text-nowrap">{{lang_lastBoot}}</td> - <td>{{lastboot_s}}</td> + <td> + {{lastboot_s}} + {{#minilinux}} + <div> + {{lang_baseSystem}}: {{minilinux}} + {{#boottime_s}} + (<span title="{{lang_boottimeTooltip}}">{{boottime_s}}</span>) + {{/boottime_s}} + </div> + {{/minilinux}} + </td> </tr> <tr> <td class="text-nowrap">{{lang_lastSeen}}</td> @@ -88,19 +104,22 @@ </td> </tr> {{/modeid}} - {{#hasroomplan}} + {{#roomsvg}} <tr> <td class="text-nowrap"> {{lang_roomplan}} </td> <td> + <div> + {{{roomsvg}}} + </div> <a href="?do=roomplanner&locationid={{locationid}}" target="_blank" - onclick="window.open(this.href, '_blank', 'toolbar=0,scrollbars,resizable');return false"> - <img src="api.php?do=roomplanner&show=svg&locationid={{locationid}}&machineuuid={{machineuuid}}&fallback=1"/> + onclick="window.open(this.href, '_blank', 'toolbar=0,scrollbars,resizable');return false"> + {{lang_edit}} </a> </td> </tr> - {{/hasroomplan}} + {{/roomsvg}} {{#rebootcontrol}} <tr> <td class="text-nowrap"> @@ -219,12 +238,14 @@ <tr> <td class="text-nowrap">{{lang_cpuModel}}</td> <td> - {{cpumodel}} - {{#Sockets}} + <a href="?do=statistics&show=list&filter[cpumodel]=1&op[cpumodel]=%3D&arg[cpumodel]={{cpumodel}}"> + {{cpumodel}} + </a> + {{#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 +264,18 @@ </tr> <tr> <td class="text-nowrap">{{lang_pcmodel}}</td> - <td>{{pcmodel}} ({{pcmanufacturer}})</td> + <td> + {{#system.Product Name}} + <a href="?do=statistics&show=list&filter[systemmodel]=1&op[systemmodel]=%3D&arg[systemmodel]={{system.Product Name}}+({{system.Manufacturer}})"> + {{system.Product Name}} ({{system.Manufacturer}}) + </a> + {{/system.Product Name}} + </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 +283,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,29 +316,64 @@ {{/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"> + <thead> + <tr class="small"> + <td>{{lang_slot}}</td> + <td></td> + <td>{{lang_speed}}</td> + <td>{{lang_manufacturer}}</td> + <td>{{lang_serialNo}}</td> + </tr> + </thead> + {{#ram}} + {{#Speed}} + <tr> + <td> + {{Locator}}, + {{Bank Locator}} + {{^Bank Locator}}{{#Set}}Set {{Set}}{{/Set}}{{/Bank Locator}} + </td> + <td class="slx-bold">{{Size}}</td> + <td>{{#Configured Memory Speed}}{{Configured Memory Speed}} / {{/Configured Memory 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 class="text-nowrap">{{lang_tempPartID}} + <div class="text-muted"> + {{lang_tempPart}} + </div> + </td> <td> <div> {{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_persistentPartID}} + <div class="text-muted"> + {{lang_persistentPart}} + </div> + </td> + <td> + <div> + {{gbid45}} GiB + </div> {{#live_id45size}} <div class="meter"> <div class="text right">{{live_id45free_s}} {{lang_free}}</div> @@ -362,16 +427,28 @@ </table> <h4>{{lang_devices}}</h4> {{#lspci1}} - <div><span class="{{lookupClass}}">{{class}}</span></div> + <div><span>{{class_s}}</span></div> {{#entries}} - <div class="small"> └ <span class="{{lookupVen}}">{{ven}}</span> <span class="{{lookupDev}}">{{dev}}</span></div> + <div class="small"> +  └ + <span class="badge">{{pt}}</span> + <span{{^vendor_s}} class="query-{{vendor}}"{{/vendor_s}}>{{vendor_s}}</span> + <span{{^device_s}} class="query-{{vendor}}-{{device}}"{{/device_s}}>{{device_s}}</span> + <a href="?do=passthrough&show=hwlist#{{vendor}}-{{device}}">[{{vendor}}:{{device}}]</a> + </div> {{/entries}} {{/lspci1}} <div id="lspci" class="collapse"> {{#lspci2}} - <div><span class="{{lookupClass}}">{{class}}</span></div> + <div><span>{{class_s}}</span></div> {{#entries}} - <div class="small"> └ <span class="{{lookupVen}}">{{ven}}</span> <span class="{{lookupDev}}">{{dev}}</span></div> + <div class="small"> +  └ + <span class="badge">{{pt}}</span> + <span{{^vendor_s}} class="query-{{vendor}}"{{/vendor_s}}>{{vendor_s}}</span> + <span{{^device_s}} class="query-{{vendor}}-{{device}}"{{/device_s}}>{{device_s}}</span> + <a href="?do=passthrough&show=hwlist#{{vendor}}-{{device}}">[{{vendor}}:{{device}}]</a> + </div> {{/entries}} {{/lspci2}} </div> @@ -380,13 +457,3 @@ </div> </div> </div> -<script type="application/javascript"><!-- -document.addEventListener("DOMContentLoaded", function () { - $('span.do-lookup').each(function () { - $(this).load('?do=statistics&lookup=' + $(this).text()); - }); - {{#biosurl}} - $('#bios-panel').load('{{{biosurl}}}'); - {{/biosurl}} -}, false); -// --></script> |