From 41612c4481111969367d1a228ad4875d781558a2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 30 Nov 2021 15:27:59 +0100
Subject: [locations] Modularize additional column handling

Additional columns are now added through a hook,
moving specialized code where it belongs.
---
 .../locations/templates/locations.html             | 107 ++++-----------------
 1 file changed, 21 insertions(+), 86 deletions(-)

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

diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index 125c101a..efd48216 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -31,21 +31,11 @@
 	<table class="table table-condensed table-hover locations" style="margin-bottom:0">
 		<tr>
 			<th width="100%">{{lang_locationName}}</th>
-			<th>
-				{{#havestatistics}}{{lang_machineCount}}{{/havestatistics}}
-			</th>
-			<th>
-				{{#havestatistics}}{{lang_machineLoad}}{{/havestatistics}}
-			</th>
-			<th class="text-nowrap">
-				{{#havebaseconfig}}{{lang_editConfigVariables}}{{/havebaseconfig}}
-			</th>
+			{{#plugins}}
 			<th class="text-nowrap">
-				{{#havesysconfig}}{{lang_sysConfig}}{{/havesysconfig}}
-			</th>
-			<th class="text-nowrap">
-				{{#haveipxe}}{{lang_bootMenu}}{{/haveipxe}}
+				{{header}}
 			</th>
+			{{/plugins}}
 		</tr>
 		{{#list}}
 			<tr>
@@ -61,85 +51,30 @@
 						</a>
 					{{/show-only}}
 				</td>
-				<td class="text-nowrap" align="right">
-					{{#havestatistics}}
-						<a href="?do=Statistics&amp;show=list&amp;filters=location={{locationid}}">&nbsp;{{clientCount}}&nbsp;</a>
-					<span style="display:inline-block;width:5ex">
-					{{#hasChild}}
-					(<a href="?do=Statistics&amp;show=list&amp;filters=location~{{locationid}}">&downarrow;{{clientCountSum}}</a>)
-					{{/hasChild}}
-					</span>
-					{{/havestatistics}}
-				</td>
-				<td class="text-nowrap load-col" {{#clientCount}} style="background:linear-gradient(to right, #f97, #f97 {{clientLoad}}%, #6fa {{clientLoad}}%, #6fa {{clientIdle}}%, #eee {{clientIdle}}%)"{{/clientCount}}>
-					{{#clientCount}}
-					{{clientLoad}}&thinsp;%
-					{{/clientCount}}
-				</td>
-				<td class="text-nowrap {{overriddenClass}}">
-					{{#havebaseconfig}}
-					<div class="pull-right" style="z-index:-1">
-						<a class="btn btn-default btn-xs" href="?do=baseconfig&amp;module=locations&amp;locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a>
-					</div>
-					{{#overriddenVars}}
-					<span class="badge" title="{{lang_overridenVarsForLocation}}">
-						<span class="glyphicon glyphicon-home"></span> {{.}}
-					</span>
-					{{/overriddenVars}}
-					{{#machineVarsOverrideCount}}
-					<span class="badge" title="{{lang_numMachinesWithOverrides}}">
-						<span class="glyphicon glyphicon-tasks"></span> {{.}}
-					</span>
-					{{/machineVarsOverrideCount}}
-					&emsp;&emsp;
-					{{/havebaseconfig}}
-				</td>
-				<td class="text-nowrap">
-					{{#havesysconfig}}
-					<div class="pull-right">
-						<a class="btn btn-default btn-xs" href="?do=sysconfig&amp;locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a>
-					</div>
-					<span class="{{configClass}}">
-					{{configName}}&emsp;&emsp;
-					</span>
-					{{/havesysconfig}}
-				</td>
-				<td class="text-nowrap">
-					{{#haveipxe}}
-						<div class="pull-right">
-							<a class="btn btn-default btn-xs" href="?do=serversetup&amp;show=assignlocation&amp;locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a>
-						</div>
-						<span class="{{customMenuClass}}">
-					{{customMenu}}&emsp;&emsp;
-					</span>
-					{{/haveipxe}}
+				{{#plugins}}
+				<td>
+					<table width="100%"><tr>
+						<td class="text-nowrap {{class}}">{{{html}}}</td>
+						{{#url}}
+						<td class="edit-btn">
+							<a class="btn btn-default btn-xs" href="{{.}}">
+								<span class="glyphicon glyphicon-edit"></span>
+							</a>
+						</td>
+						{{/url}}
+					</tr></table>
 				</td>
+				{{/plugins}}
 			</tr>
 		{{/list}}
-		{{#unassignedCount}}
 		<tr>
 			<td>{{lang_unassignedMachines}}</td>
-			<td class="text-nowrap" align="right">
-				<a href="?do=Statistics&amp;show=list&amp;filters=location=0">
-					&nbsp;{{unassignedCount}}&nbsp;
-				</a>
-				<span style="display:inline-block;width:5ex"></span>
-			</td>
-			<td class="text-nowrap load-col"{{#unassignedCount}} style="background:linear-gradient(to right, #f97, #f97 {{unassignedLoad}}%, #6fa {{unassignedLoad}}%, #6fa {{unassignedIdle}}%, #eee {{unassignedIdle}}%)"{{/unassignedCount}}>
-				{{#unassignedCount}}
-				{{unassignedLoad}}&thinsp;%
-				{{/unassignedCount}}
-			</td>
-			<td>
-				{{#unassignedOverrides}}
-				<span class="badge" title="{{lang_numMachinesWithOverrides}}">
-					<span class="glyphicon glyphicon-tasks"></span> {{.}}
-				</span>
-				{{/unassignedOverrides}}
+			{{#plugins}}
+			<td class="text-nowrap">
+				{{{propagateDefaultHtml}}}
 			</td>
-			<td>{{defaultConfig}}</td>
+			{{/plugins}}
 		</tr>
-		{{/unassignedCount}}
 	</table>
 	<form method="post" action="?do=Locations">
 		<input type="hidden" name="token" value="{{token}}">
@@ -214,7 +149,7 @@ function slxOpenLocation(e, lid) {
 		}
 		return;
 	}
-	var td = $('<td>').attr('colspan', '6').css('padding', '0px 0px 12px');
+	var td = $('<td>').attr('colspan', '{{colspan}}').css('padding', '0px 0px 12px');
 	var tr = $('<tr>').attr('id', 'location-details-' + lid);
 	tr.append(td);
 	$(e).closest('tr').addClass('active slx-bold').after(tr);
-- 
cgit v1.2.3-55-g7522