From 5445af45404b7941c2b729c8b90fb623fb8cbd17 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 2 Aug 2016 12:31:39 +0200 Subject: [statistics] Tweak layout, ellipsis in table without ruining layout (super awesome solution) --- .../statistics/lang/de/template-tags.json | 5 ++-- .../statistics/lang/en/template-tags.json | 7 ++++-- .../statistics/templates/cpumodels.html | 11 +++++---- .../statistics/templates/machine-main.html | 28 +++++++++++----------- .../statistics/templates/machine-usage.html | 12 +++++----- 5 files changed, 34 insertions(+), 29 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 85229a49..1c893e2a 100644 --- a/modules-available/statistics/lang/de/template-tags.json +++ b/modules-available/statistics/lang/de/template-tags.json @@ -9,7 +9,9 @@ "lang_cpuModel": "CPU", "lang_details": "Details", "lang_devices": "Ger\u00e4te", + "lang_duration": "Dauer", "lang_event": "Ereignis", + "lang_eventType": "Typ", "lang_firstSeen": "Erste Aktivit\u00e4t", "lang_gbRam": "RAM", "lang_hardwareSummary": "Hardware", @@ -57,7 +59,6 @@ "lang_ramSlots": "Speicher-Slots", "lang_realCores": "Kerne", "lang_reallocatedSectors": "Defekte Sektoren", - "lang_refresh": "Ansicht aktualisieren", "lang_serialNo": "Serien-Nr", "lang_showList": "Liste", "lang_showVisualization": "Visualisierung", @@ -73,4 +74,4 @@ "lang_virtualCores": "Virtuelle Kerne", "lang_when": "Wann", "lang_withBadSectors": "Clients mit potentiell defekten Festplatten (mehr als 10 defekte Sektoren)" -} +} \ No newline at end of file diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json index 6178d4c3..e11073ae 100644 --- a/modules-available/statistics/lang/en/template-tags.json +++ b/modules-available/statistics/lang/en/template-tags.json @@ -9,7 +9,9 @@ "lang_cpuModel": "CPU", "lang_details": "Details", "lang_devices": "Devices", + "lang_duration": "Duration", "lang_event": "Event", + "lang_eventType": "Type", "lang_firstSeen": "First seen", "lang_gbRam": "RAM", "lang_hardwareSummary": "Hardware", @@ -57,8 +59,9 @@ "lang_ramSlots": "Memory slots", "lang_realCores": "Cores", "lang_reallocatedSectors": "Bad sectors", - "lang_refresh": "Refresh", "lang_serialNo": "Serial no", + "lang_showList": "Show list", + "lang_showVisualization": "Show visualization", "lang_sockets": "Sockets", "lang_tempPart": "Temp. partition", "lang_tempPartStats": "Temporary partition", @@ -71,4 +74,4 @@ "lang_virtualCores": "Virtual cores", "lang_when": "When", "lang_withBadSectors": "Clients with potentially bad HDDs (more than 10 reallocated sectors)" -} +} \ No newline at end of file diff --git a/modules-available/statistics/templates/cpumodels.html b/modules-available/statistics/templates/cpumodels.html index 0ab5286f..20da4697 100644 --- a/modules-available/statistics/templates/cpumodels.html +++ b/modules-available/statistics/templates/cpumodels.html @@ -6,17 +6,18 @@
- +
- - + + {{#rows}} -
{{lang_modelName}}{{lang_cpuCores}}{{lang_modelCount}}{{lang_cpuCores}}{{lang_modelCount}}
+ +
{{systemmodel}} +
{{cores}} diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index f76b5770..333af1ec 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -18,37 +18,37 @@
- + - + - + {{#hostname}} - + {{/hostname}} - + - + - + - +
{{lang_uuid}}{{lang_uuid}} {{machineuuid}}
{{lang_macAddr}}{{lang_macAddr}} {{macaddr}}
{{lang_ip}}{{lang_ip}} {{clientip}}
{{lang_hostname}}{{lang_hostname}} {{hostname}}
{{lang_firstSeen}}{{lang_firstSeen}} {{firstseen_s}}
{{lang_lastBoot}}{{lang_lastBoot}} {{lastboot_s}}
{{lang_lastSeen}}{{lang_lastSeen}} {{lastseen_s}}
{{lang_usageState}}{{lang_usageState}} {{#state_off}} {{lang_machineOff}} @@ -82,7 +82,7 @@
- + - + - + {{#extram}} - + {{/extram}} - + - +
{{lang_cpuModel}}{{lang_cpuModel}} {{cpumodel}} {{#Sockets}} @@ -93,11 +93,11 @@
{{lang_model}}{{lang_model}} {{pcmodel}} ({{manufacturer}})
{{lang_ram}}{{lang_ram}} {{gbram}} GiB {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}} @@ -106,7 +106,7 @@
{{lang_ramSlots}}{{lang_ramSlots}} {{ramslotcount}}: {{#ramslot}} @@ -116,11 +116,11 @@
{{lang_tempPart}}{{lang_tempPart}} {{gbtmp}} GiB
{{lang_64bitSupport}}{{lang_64bitSupport}} {{kvmstate}}
diff --git a/modules-available/statistics/templates/machine-usage.html b/modules-available/statistics/templates/machine-usage.html index ffaa747b..ef969fc6 100644 --- a/modules-available/statistics/templates/machine-usage.html +++ b/modules-available/statistics/templates/machine-usage.html @@ -9,9 +9,9 @@
- - - + + + {{#rows}} @@ -26,9 +26,9 @@
TypeWhenLength{{lang_eventType}}{{lang_when}}{{lang_duration}}
{{#hasrows2}} - - - + + + {{/hasrows2}} {{#rows2}} -- cgit v1.2.3-55-g7522
TypeWhenLength{{lang_eventType}}{{lang_when}}{{lang_duration}}