From 0914ae089ccaaa1a44d6d6fab4e6966dd06b813c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 30 Nov 2017 14:16:35 +0100
Subject: [statistics] Handle runmode and its isclient flag

---
 .../statistics/templates/clientlist.html           |  1 +
 .../statistics/templates/machine-main.html         |  8 +++
 .../statistics/templates/machine-usage.html        | 80 ++++++++++++----------
 .../statistics/templates/summary.html              |  8 ++-
 4 files changed, 58 insertions(+), 39 deletions(-)

(limited to 'modules-available/statistics/templates')

diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html
index 4755c3c1..0e88a15c 100644
--- a/modules-available/statistics/templates/clientlist.html
+++ b/modules-available/statistics/templates/clientlist.html
@@ -74,6 +74,7 @@
 			{{/state_STANDBY}}
 			<a href="?do=Statistics&amp;uuid={{machineuuid}}"><b>{{hostname}}</b></a>
 			<div class="small">{{machineuuid}}</div>
+			{{#rmmodule}}<div class="small">{{lang_runMode}}: <a class="slx-bold" href="?do=runmode&amp;module={{rmmodule}}">{{rmmodule}}</a></div>{{/rmmodule}}
 		</td>
 		<td><b><a href="?do=Statistics&amp;show=list&amp;filters=subnet={{subnet}}">{{subnet}}</a>{{lastoctet}}</b><br>{{macaddr}}</td>
 		<td class="text-right">{{lastseen}}</td>
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html
index 1854a03b..14d388d3 100644
--- a/modules-available/statistics/templates/machine-main.html
+++ b/modules-available/statistics/templates/machine-main.html
@@ -80,6 +80,14 @@
 							{{/session}}
 						</td>
 					</tr>
+					{{#modeid}}
+						<tr>
+							<td class="text-nowrap">{{lang_runMode}}</td>
+							<td>
+								<a href="?do={{modeid}}">{{moduleName}}</a> – {{modeName}}
+							</td>
+						</tr>
+					{{/modeid}}
 				</table>
 			</div>
 		</div>
diff --git a/modules-available/statistics/templates/machine-usage.html b/modules-available/statistics/templates/machine-usage.html
index ef969fc6..be435ee5 100644
--- a/modules-available/statistics/templates/machine-usage.html
+++ b/modules-available/statistics/templates/machine-usage.html
@@ -5,46 +5,50 @@
 				{{lang_usageDetails}}
 			</div>
 			<div class="panel-body">
-				<div class="row">
-					<div class="col-sm-6">
-						<table class="table table-condensed">
-							<tr>
-								<th>{{lang_eventType}}</th>
-								<th>{{lang_when}}</th>
-								<th>{{lang_duration}}</th>
-							</tr>
-							{{#rows}}
-							<tr>
-								<td><span class="glyphicon glyphicon-{{glyph}}"></span></td>
-								<td>{{from}}</td>
-								<td>{{duration}}</td>
-							</tr>
-							{{/rows}}
-						</table>
+				{{#isclient}}
+					<div class="row">
+						<div class="col-sm-6">
+							<table class="table table-condensed">
+								<tr>
+									<th>{{lang_eventType}}</th>
+									<th>{{lang_when}}</th>
+									<th>{{lang_duration}}</th>
+								</tr>
+								{{#rows}}
+									<tr>
+										<td><span class="glyphicon glyphicon-{{glyph}}"></span></td>
+										<td>{{from}}</td>
+										<td>{{duration}}</td>
+									</tr>
+								{{/rows}}
+							</table>
+						</div>
+						<div class="col-sm-6">
+							<table class="table table-condensed">
+								{{#hasrows2}}
+									<tr>
+										<th>{{lang_eventType}}</th>
+										<th>{{lang_when}}</th>
+										<th>{{lang_duration}}</th>
+									</tr>
+								{{/hasrows2}}
+								{{#rows2}}
+									<tr>
+										<td><span class="glyphicon glyphicon-{{glyph}}"></span></td>
+										<td>{{from}}</td>
+										<td>{{duration}}</td>
+									</tr>
+								{{/rows2}}
+							</table>
+						</div>
 					</div>
-					<div class="col-sm-6">
-						<table class="table table-condensed">
-							{{#hasrows2}}
-							<tr>
-								<th>{{lang_eventType}}</th>
-								<th>{{lang_when}}</th>
-								<th>{{lang_duration}}</th>
-							</tr>
-							{{/hasrows2}}
-							{{#rows2}}
-							<tr>
-								<td><span class="glyphicon glyphicon-{{glyph}}"></span></td>
-								<td>{{from}}</td>
-								<td>{{duration}}</td>
-							</tr>
-							{{/rows2}}
-						</table>
-					</div>
-				</div>
+				{{/isclient}}
 				<div class="timebar">&nbsp;{{{graph}}}</div>
-				<div>
-					{{lang_timebarDesc}}
-				</div>
+				{{#isclient}}
+					<div>
+						{{lang_timebarDesc}}
+					</div>
+				{{/isclient}}
 			</div>
 		</div>
 	</div>
diff --git a/modules-available/statistics/templates/summary.html b/modules-available/statistics/templates/summary.html
index 642c48fc..fe9559ed 100644
--- a/modules-available/statistics/templates/summary.html
+++ b/modules-available/statistics/templates/summary.html
@@ -1,6 +1,11 @@
 <div class="col-md-12">
 	<div class="panel panel-default">
 		<div class="panel-body">
+			{{#runmode}}
+				<div class="pull-right">
+					<a href="?do=runmode">{{lang_runmodeMachines}}</a>: <b>{{runmode}}</b>
+				</div>
+			{{/runmode}}
 			<div>
 				{{lang_knownMachines}}: <b>{{known}}</b>&emsp;
 				<a href="?do=Statistics&amp;show=stat&amp;filters={{query}}~,~state=on">{{lang_onlineMachines}}</a>: <b>{{online}}</b>&emsp;
@@ -10,8 +15,9 @@
 			<div>
 				<span class="glyphicon glyphicon-exclamation-sign red"></span>
 				<a href="?do=Statistics&amp;show=list&amp;filters={{query}}~,~badsectors>=10">
-					{{lang_withBadSectors}}: <b>{{badhdd}}</b>
+					{{lang_withBadSectors}}:
 				</a>
+				<b>{{badhdd}}</b>
 			</div>
 			{{/badhdd}}
 		</div>
-- 
cgit v1.2.3-55-g7522