From 7d4b41dc7e85b4f5f249c61db11ae27d53144c9c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 25 Apr 2018 16:46:18 +0200
Subject: [rebootcontrol] Nicer status list; list of all running jobs

---
 .../rebootcontrol/templates/status.html            | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'modules-available/rebootcontrol/templates/status.html')

diff --git a/modules-available/rebootcontrol/templates/status.html b/modules-available/rebootcontrol/templates/status.html
index c2fdab46..c05b2fad 100644
--- a/modules-available/rebootcontrol/templates/status.html
+++ b/modules-available/rebootcontrol/templates/status.html
@@ -7,8 +7,6 @@
 	</form>
 </div>
 
-<div data-tm-id="{{taskId}}" data-tm-log="error" data-tm-callback="updateStatus"></div>
-
 <div>
 	<table class="table table-hover stupidtable" id="dataTable">
 		<thead>
@@ -24,7 +22,7 @@
 		<tbody>
 		{{#clients}}
 			<tr>
-				<td>{{machineuuid}}</td>
+				<td>{{hostname}}{{^hostname}}{{machineuuid}}{{/hostname}}</td>
 				<td>{{clientip}}</td>
 				<td id="status-{{machineuuid}}"></td>
 			</tr>
@@ -33,6 +31,8 @@
 	</table>
 </div>
 
+<div data-tm-id="{{taskId}}" data-tm-log="error" data-tm-callback="updateStatus"></div>
+
 <script type="application/javascript">
 	statusStrings = {
 		"CONNECTING" : "{{lang_connecting}}",
@@ -50,12 +50,20 @@
 			return;
 		var clientStatus = task.data.clientStatus;
 		for (var uuid in clientStatus) {
-			if (clientStatus.hasOwnProperty(uuid)) {
-				var shutdownTime = ' ';
-				if (clientStatus[uuid] === 'SHUTDOWN_AT' || clientStatus[uuid] === 'REBOOT_AT') {
-					shutdownTime += task.data.time;
-				}
-				$("#status-" + uuid).text(statusStrings[clientStatus[uuid]] + shutdownTime);
+			if (!clientStatus.hasOwnProperty(uuid))
+				continue;
+			var $s = $("#status-" + uuid);
+			var status = clientStatus[uuid];
+			if ($s.data('state') === status)
+				continue;
+			$s.data('state', status);
+			var text = statusStrings[status];
+			if (status === 'SHUTDOWN_AT' || status === 'REBOOT_AT') {
+				text += ' ' + task.data.time;
+			}
+			$s.text(text);
+			if (status === 'CONNECTING' || status === 'REBOOTING') {
+				$s.append('<span class="glyphicon glyphicon-hourglass"></span>');
 			}
 		}
 	}
-- 
cgit v1.2.3-55-g7522