From 9c5887928eb087fbc63744142b3bfd6af68e0cea Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Thu, 28 Sep 2017 16:54:42 +0200 Subject: [statistics] fixed inconsistencies --- .../statistics/lang/de/template-tags.json | 3 +- .../statistics/lang/en/template-tags.json | 7 +- modules-available/statistics/page.inc.php | 2 + .../statistics/templates/clientlist.html | 158 ++++++++++----------- .../statistics/templates/cpumodels.html | 58 ++++---- .../statistics/templates/filterbox.html | 93 +++++++----- modules-available/statistics/templates/id44.html | 46 +++--- .../statistics/templates/kvmstate.html | 30 ++-- .../statistics/templates/machine-notes.html | 3 +- modules-available/statistics/templates/memory.html | 46 +++--- .../statistics/templates/newclients.html | 54 +++---- 11 files changed, 270 insertions(+), 230 deletions(-) (limited to 'modules-available/statistics') diff --git a/modules-available/statistics/lang/de/template-tags.json b/modules-available/statistics/lang/de/template-tags.json index e0be0d48..ab22ee86 100644 --- a/modules-available/statistics/lang/de/template-tags.json +++ b/modules-available/statistics/lang/de/template-tags.json @@ -45,6 +45,7 @@ "lang_modelName": "Modellname", "lang_modelNo": "Modell", "lang_modelStats": "PC-Modelle", + "lang_moduleHeading": "Client-Statistiken", "lang_more": "Mehr", "lang_newMachines": "Neue Ger\u00e4te", "lang_noEdid": "Kein EDID", @@ -73,7 +74,7 @@ "lang_tempPartStats": "Tempor\u00e4re Partition", "lang_thoseAreProjectors": "Diese Modellnamen werden als Beamer behandelt, auch wenn die EDID-Informationen des Ger\u00e4tes anderes berichten.", "lang_timebarDesc": "Visuelle Darstellung der letzten Tage. Rote Abschnitte zeigen, wann der Rechner belegt war, gr\u00fcne, wann er nicht verwendet wurde, aber eingeschaltet war. Die leicht abgedunkelten Abschnitte markieren N\u00e4chte (22 bis 8 Uhr).", - "lang_tmpGb": "HDD-Temp", + "lang_tmpGb": "Temp-HDD", "lang_total": "Gesamt", "lang_usageDetails": "Nutzungsdetails", "lang_usageState": "Zustand", diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json index 4a31a5ee..6597d953 100644 --- a/modules-available/statistics/lang/en/template-tags.json +++ b/modules-available/statistics/lang/en/template-tags.json @@ -45,6 +45,7 @@ "lang_modelName": "Model name", "lang_modelNo": "Model", "lang_modelStats": "PC models", + "lang_moduleHeading": "Client Statistics", "lang_more": "More", "lang_newMachines": "New machines", "lang_noEdid": "No EDID", @@ -66,14 +67,14 @@ "lang_reallocatedSectors": "Bad sectors", "lang_screens": "Screens", "lang_serialNo": "Serial no", - "lang_showList": "Show list", - "lang_showVisualization": "Show visualization", + "lang_showList": "List", + "lang_showVisualization": "Visualization", "lang_sockets": "Sockets", "lang_tempPart": "Temp. partition", "lang_tempPartStats": "Temporary partition", "lang_thoseAreProjectors": "These model names will always be treated as beamers, even if the device's EDID data says otherwise.", "lang_timebarDesc": "Visual representation of the last few days. Red parts mark periods where the client was occupied, green parts where the client was idle. Dimmed parts mark nights (10pm to 8am).", - "lang_tmpGb": "HDD temp", + "lang_tmpGb": "Temp HDD", "lang_total": "Total", "lang_usageDetails": "Detailed usage", "lang_usageState": "State", diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index 2b12c69f..810d624e 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -533,6 +533,7 @@ class Page_Statistics extends Page if (empty($row['hostname'])) { $row['hostname'] = $row['clientip']; } + $row['firstseen_int'] = $row['firstseen']; $row['firstseen'] = date('d.m. H:i', $row['firstseen']); $row['gbram'] = round(round($row['mbram'] / 500) / 2, 1); // Trial and error until we got "expected" rounding.. $row['gbtmp'] = round($row['id44mb'] / 1024); @@ -574,6 +575,7 @@ class Page_Statistics extends Page $row['state_occupied'] = true; } //$row['firstseen'] = date('d.m.Y H:i', $row['firstseen']); + $row['lastseen_int'] = $row['lastseen']; $row['lastseen'] = date('d.m. H:i', $row['lastseen']); //$row['lastboot'] = date('d.m. H:i', $row['lastboot']); $row['gbram'] = round(round($row['mbram'] / 500) / 2, 1); // Trial and error until we got "expected" rounding.. diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index 73148eb8..ecfe622c 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -1,94 +1,81 @@ + - -

{{lang_clientList}} ({{rowCount}})

- -
- - - - + + + + - + - - - {{#rows}} - - - - - - - - - - {{/rows}} + + + + + + + + + + + + + + + + {{#rows}} + + + + + + + + + + {{/rows}} +
{{lang_machine}}{{lang_address}} -
- -
- - 		{{lang_lastSeen}} -
- +
- - - - {{lang_kvmSupport}} -
- - -
- 		- {{lang_gbRam}} -
- + +
+ + - - - - {{lang_tmpGb}} -
- - -
- 		{{lang_cpuModel}} -
- - -
-
- {{#hasnotes}}{{/hasnotes}} - {{#state_off}} - - {{/state_off}} - {{#state_idle}} - - {{/state_idle}} - {{#state_occupied}} - - {{/state_occupied}} - {{hostname}} -
{{machineuuid}}
- 		{{subnet}}{{lastoctet}}
{{macaddr}}		{{lastseen}}{{kvmstate}}{{gbram}} GiB - {{gbtmp}} GiB - {{#badsectors}}
- - {{badsectors}} -
{{/badsectors}} - {{#nohdd}}
- -
{{/nohdd}} - 		{{lang_realCores}}: {{realcores}}
{{cpumodel}}
+ + + +
{{lang_machine}}{{lang_address}}{{lang_lastSeen}}{{lang_kvmSupport}}{{lang_gbRam}}{{lang_tmpGb}}{{lang_cpuModel}}
+ {{#hasnotes}}{{/hasnotes}} + {{#state_off}} + + {{/state_off}} + {{#state_idle}} + + {{/state_idle}} + {{#state_occupied}} + + {{/state_occupied}} + {{hostname}} +
{{machineuuid}}
+ 		{{subnet}}{{lastoctet}}
{{macaddr}}		{{lastseen}}{{kvmstate}}{{gbram}} GiB + {{gbtmp}} GiB + {{#badsectors}}
+ + {{badsectors}} +
{{/badsectors}} + {{#nohdd}}
+ +
{{/nohdd}} + 		{{lang_realCores}}: {{realcores}}
{{cpumodel}}