From a6a484ea37aeb91f848c11cb818e2d7d4351d391 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 22 Jun 2016 17:56:04 +0200
Subject: [locations/sysconfig] Implement location specific sysconfig

---
 .../locations/templates/locations.html             | 35 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 5 deletions(-)

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

diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index e8b5d707..11142ef8 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -6,34 +6,59 @@
 	<table class="table table-condensed" style="margin-bottom:0px">
 		<tr>
 			<th width="100%">{{lang_locationName}}</th>
-			<th></th>
+			<th>{{#havestatistics}}{{lang_machineCount}}{{/havestatistics}}</th>
+			<th class="slx-nowrap">{{lang_editConfigVariables}}</th>
+			{{#havesysconfig}}
+			<th class="slx-nowrap">
+				{{#havebaseconfig}}{{lang_sysConfig}}{{/havebaseconfig}}
+			</th>
+			{{/havesysconfig}}
 		</tr>
 		{{#list}}
 			<tr>
 				<td>
 					<div style="display:inline-block;width:{{depth}}em"></div>
-					<a href="#" onclick="slxOpenLocation(this, {{locationid}})">{{locationname}}<b class="caret"></b></a>
+					<a href="#" onclick="slxOpenLocation(this, {{locationid}})">{{locationname}} <b class="caret"></b></a>
 				</td>
 				<td class="slx-nowrap" align="right">
 					{{#havestatistics}}
 					{{clientCount}}
 					<a class="btn btn-default btn-xs" href="?do=Statistics&amp;filter=location&amp;argument={{locationid}}"><span class="glyphicon glyphicon-eye-open"></span></a>
 					{{/havestatistics}}
+				</td>
+				<td class="slx-nowrap">
 					{{#havebaseconfig}}
-					<a class="btn btn-success btn-xs" href="?do=baseconfig&amp;module=locations&amp;locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span> {{lang_editConfigVariables}}</a>
+					<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}}
+					{{lang_overrideCount}}: {{overriddenVars}}
+					{{/overriddenVars}}
 					{{/havebaseconfig}}
 				</td>
+				<td class="slx-nowrap">
+					<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}}
+					</span>
+					{{#havesysconfig}}
+					{{/havesysconfig}}
+				</td>
 			</tr>
 		{{/list}}
 		{{#unassignedCount}}
 		<tr>
-			<td></td>
+			<td>{{lang_unassignedMachines}}</td>
 			<td class="slx-nowrap" align="right">
-				{{lang_unassignedMachines}}: {{unassignedCount}}
+				{{unassignedCount}}
 				<a class="btn btn-default btn-xs" href="?do=Statistics&amp;filter=location&amp;argument=0">
 					<span class="glyphicon glyphicon-eye-open"></span>
 				</a>
 			</td>
+			<td></td>
+			<td>{{defaultConfig}}</td>
 		</tr>
 		{{/unassignedCount}}
 	</table>
-- 
cgit v1.2.3-55-g7522