From 1ee0014fcf0ec56af6af5937258d065ba3ee1cc9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 13 Sep 2016 19:42:09 +0200
Subject: [locations] Show percent of occupied machines per location

---
 modules-available/locations/templates/locations.html | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 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 99fb59fd..9dcc6db1 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -3,12 +3,15 @@
 		<a href="?do=Locations&amp;action=showsubnets">{{lang_thisListBySubnet}}</a>
 	</div>
 	<h1>{{lang_locationsMainHeading}}</h1>
-	<table class="table table-condensed" style="margin-bottom:0px">
+	<table class="table table-condensed locations" style="margin-bottom:0px">
 		<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>
@@ -32,6 +35,11 @@
 					<a class="btn btn-default btn-xs" href="?do=Statistics&amp;show=list&amp;filters=location={{locationid}}"><span class="glyphicon glyphicon-eye-open"></span></a>
 					{{/havestatistics}}
 				</td>
+				<td class="text-nowrap" align="right">
+					{{#havestatistics}}
+					{{clientLoad}}
+					{{/havestatistics}}
+				</td>
 				<td class="text-nowrap">
 					{{#havebaseconfig}}
 					<div class="pull-right" style="z-index:-1">
@@ -63,6 +71,9 @@
 					<span class="glyphicon glyphicon-eye-open"></span>
 				</a>
 			</td>
+			<td class="text-nowrap" align="right">
+				{{clientLoad}}
+			</td>
 			<td></td>
 			<td>{{defaultConfig}}</td>
 		</tr>
@@ -129,7 +140,7 @@ function slxOpenLocation(e, lid) {
 		}
 		return;
 	}
-	var td = $('<td>').attr('colspan', '4').css('padding', '0px 0px 12px');
+	var td = $('<td>').attr('colspan', '5').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