[statistics] Tweak layout, ellipsis in table without ruining layout (super awesome solution)

3 files changed, 26 insertions, 25 deletions

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 @@
 		<div class="panel-body">
 			<div class="row">
 				<div class="col-md-8">
-					<table class="table table-condensed table-striped table-responsive"
-						style="table-layout: fixed;">
+					<table class="table table-condensed table-striped table-responsive">
 						<tr>
 							<th>{{lang_modelName}}</th>
-							<th class="text-right">{{lang_cpuCores}}</th>
-							<th class="text-right">{{lang_modelCount}}</th>
+							<th class="text-right text-nowrap">{{lang_cpuCores}}</th>
+							<th class="text-right text-nowrap">{{lang_modelCount}}</th>
 						</tr>
 						{{#rows}}
 						<tr id="{{id}}">
-							<td class="text-left text-nowrap filter-col" data-filter-col="systemmodel" style="overflow:hidden;text-overflow: ellipsis;">
+							<td class="text-left text-nowrap filter-col" data-filter-col="systemmodel">
+								<table style="width:100%; table-layout: fixed;"><tr><td style="overflow:hidden;text-overflow: ellipsis;">
 								<a class="filter-val" data-filter-val="{{systemmodel}}" href="?do=Statistics&amp;show=stat&amp;filters={{query}}~,~systemmodel={{urlsystemmodel}}">{{systemmodel}}</a>
+								</td></tr></table>
 							</td>
 							<td class="text-right filter-col" data-filter-col="realcores">
 								<a class="filter-val" data-filter-val="{{cores}}" href="?do=Statistics&amp;show=stat&amp;filters={{query}}~,~realcores={{cores}}">{{cores}}</a>
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 @@
 			<div class="panel-body">
 				<table class="table table-condensed">
 					<tr>
-						<td>{{lang_uuid}}</td>
+						<td class="text-nowrap">{{lang_uuid}}</td>
 						<td>{{machineuuid}}</td>
 					</tr>
 					<tr>
-						<td>{{lang_macAddr}}</td>
+						<td class="text-nowrap">{{lang_macAddr}}</td>
 						<td>{{macaddr}}</td>
 					</tr>
 					<tr>
-						<td>{{lang_ip}}</td>
+						<td class="text-nowrap">{{lang_ip}}</td>
 						<td>{{clientip}}</td>
 					</tr>
 					{{#hostname}}
 					<tr>
-						<td>{{lang_hostname}}</td>
+						<td class="text-nowrap">{{lang_hostname}}</td>
 						<td>{{hostname}}</td>
 					</tr>
 					{{/hostname}}
 					<tr>
-						<td>{{lang_firstSeen}}</td>
+						<td class="text-nowrap">{{lang_firstSeen}}</td>
 						<td>{{firstseen_s}}</td>
 					</tr>
 					<tr>
-						<td>{{lang_lastBoot}}</td>
+						<td class="text-nowrap">{{lang_lastBoot}}</td>
 						<td>{{lastboot_s}}</td>
 					</tr>
 					<tr>
-						<td>{{lang_lastSeen}}</td>
+						<td class="text-nowrap">{{lang_lastSeen}}</td>
 						<td>{{lastseen_s}}</td>
 					</tr>
 					<tr>
-						<td>{{lang_usageState}}</td>
+						<td class="text-nowrap">{{lang_usageState}}</td>
 						<td>
 							{{#state_off}}
 							<span class="glyphicon glyphicon-off"></span> {{lang_machineOff}}
@@ -82,7 +82,7 @@
 			<div class="panel-body">
 				<table class="table table-condensed">
 					<tr>
-						<td>{{lang_cpuModel}}</td>
+						<td class="text-nowrap">{{lang_cpuModel}}</td>
 						<td>
 							{{cpumodel}}
 							{{#Sockets}}
@@ -93,11 +93,11 @@
 						</td>
 					</tr>
 					<tr>
-						<td>{{lang_model}}</td>
+						<td class="text-nowrap">{{lang_model}}</td>
 						<td>{{pcmodel}} ({{manufacturer}})</td>
 					</tr>
 					<tr class="{{ramclass}}">
-						<td>{{lang_ram}}</td>
+						<td class="text-nowrap">{{lang_ram}}</td>
 						<td>
 							{{gbram}}&thinsp;GiB
 							{{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}}
@@ -106,7 +106,7 @@
 					</tr>
 					{{#extram}}
 					<tr>
-						<td>{{lang_ramSlots}}</td>
+						<td class="text-nowrap">{{lang_ramSlots}}</td>
 						<td>
 							{{ramslotcount}}:
 							{{#ramslot}}
@@ -116,11 +116,11 @@
 					</tr>
 					{{/extram}}
 					<tr class="{{hddclass}}">
-						<td>{{lang_tempPart}}</td>
+						<td class="text-nowrap">{{lang_tempPart}}</td>
 						<td>{{gbtmp}}&thinsp;GiB</td>
 					</tr>
 					<tr class="{{kvmclass}}">
-						<td>{{lang_64bitSupport}}</td>
+						<td class="text-nowrap">{{lang_64bitSupport}}</td>
 						<td>{{kvmstate}}</td>
 					</tr>
 				</table>
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 @@
 					<div class="col-sm-6">
 						<table class="table table-condensed">
 							<tr>
-								<th>Type</th>
-								<th>When</th>
-								<th>Length</th>
+								<th>{{lang_eventType}}</th>
+								<th>{{lang_when}}</th>
+								<th>{{lang_duration}}</th>
 							</tr>
 							{{#rows}}
 							<tr>
@@ -26,9 +26,9 @@
 						<table class="table table-condensed">
 							{{#hasrows2}}
 							<tr>
-								<th>Type</th>
-								<th>When</th>
-								<th>Length</th>
+								<th>{{lang_eventType}}</th>
+								<th>{{lang_when}}</th>
+								<th>{{lang_duration}}</th>
 							</tr>
 							{{/hasrows2}}
 							{{#rows2}}