[locations] Support CIDR notion (start field), tweak templates a bit

3 files changed, 38 insertions, 29 deletions

diff --git a/modules-available/locations/templates/location-subnets.html b/modules-available/locations/templates/location-subnets.html
index b0353416..23035002 100644
--- a/modules-available/locations/templates/location-subnets.html
+++ b/modules-available/locations/templates/location-subnets.html
@@ -43,31 +43,35 @@
 				<th title="{{lang_deleteSubnet}}"><span class="glyphicon glyphicon-trash"></span></th>
 			</tr>
 			{{#list}}
-				<tr>
+				<tr class="cidrmagic">
 					<td>{{subnetid}}</td>
-					<td><input class="form-control" type="text" name="startaddr[{{subnetid}}]" value="{{startaddr}}" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"></td>
-					<td><input class="form-control" type="text" name="endaddr[{{subnetid}}]" value="{{endaddr}}" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"></td>
+					<td><input class="form-control cidrstart" type="text" name="startaddr[{{subnetid}}]" value="{{startaddr}}" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"></td>
+					<td><input class="form-control cidrend" type="text" name="endaddr[{{subnetid}}]" value="{{endaddr}}" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"></td>
 					<td class="danger" align="center"><input type="checkbox" name="deletesubnet[{{subnetid}}]" value="on"></td>
 				</tr>
 			{{/list}}
 			<tr id="loc-sub-{{locationid}}">
-				<td colspan="2">
+				<td colspan="4">
 					<button class="btn btn-success btn-sm" type="button" onclick="slxAddSubnetRow(this, {{locationid}})" title="{{lang_addNewSubnet}}">
 						<span class="glyphicon glyphicon-plus-sign"></span> {{lang_subnet}}
 					</button>
 				</td>
-				<td colspan="2" align="right">
-					<button type="submit" class="btn btn-primary">{{lang_save}}</button>
-				</td>
 			</tr>
 		</table>
+		<br>
+		<div class="pull-right">
+			<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+		</div>
+		<div class="slx-bold">{{lang_locationInfo}}</div>
+		{{#haveDozmod}}
+		<div>
+			<span class="slx-ga2">{{lang_referencingLectures}}:</span> {{lectures}}
+		</div>
+		{{/haveDozmod}}
+		{{#haveStatistics}}
+		<div>
+			<span class="slx-ga2">{{lang_matchingMachines}}:</span> <a href="?do=Statistics&amp;filter=location&amp;argument={{locationid}}">{{machines}} / {{machines_online}} / {{machines_used}} ({{used_percent}}%)</a>
+		</div>
+		{{/haveStatistics}}
 	</form>
-	<br>
-	<div class="slx-bold">{{lang_locationInfo}}</div>
-	<div>
-		<span class="slx-ga2">{{lang_referencingLectures}}:</span> {{lectures}}
-	</div>
-	<div>
-		<span class="slx-ga2">{{lang_matchingMachines}}:</span> <a href="?do=Statistics&amp;filter=location&amp;argument={{locationid}}">{{machines}} / {{machines_online}} / {{machines_used}} ({{used_percent}}%)</a>
-	</div>
 </div>
\ No newline at end of file
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index 2971105b..1fb60926 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -6,13 +6,15 @@
 	<table class="table table-condensed" style="margin-bottom:0px">
 		<tr>
 			<th width="100%">{{lang_locationName}}</th>
-			<th>{{#havestatistics}}{{lang_machineCount}}{{/havestatistics}}</th>
-			<th class="slx-nowrap">{{lang_editConfigVariables}}</th>
-			{{#havesysconfig}}
+			<th>
+				{{#havestatistics}}{{lang_machineCount}}{{/havestatistics}}
+			</th>
+			<th class="slx-nowrap">
+				{{#havebaseconfig}}{{lang_editConfigVariables}}{{/havebaseconfig}}
+			</th>
 			<th class="slx-nowrap">
-				{{#havebaseconfig}}{{lang_sysConfig}}{{/havebaseconfig}}
+				{{#havesysconfig}}{{lang_sysConfig}}{{/havesysconfig}}
 			</th>
-			{{/havesysconfig}}
 		</tr>
 		{{#list}}
 			<tr>
@@ -37,13 +39,13 @@
 					{{/havebaseconfig}}
 				</td>
 				<td class="slx-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}}
 					{{/havesysconfig}}
 				</td>
 			</tr>
@@ -123,23 +125,26 @@ function slxOpenLocation(e, lid) {
 		}
 		return;
 	}
-	var td = $('<td>').attr('colspan', '2').css('padding', '0px 0px 12px');
+	var td = $('<td>').attr('colspan', '4').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);
-	td.load('?do=Locations&action=showlocation&locationid=' + lid);
+	td.load('?do=Locations&action=showlocation&locationid=' + lid, function() {
+		slxAttachCidr();
+	});
 	slxLastLocation = tr;
 }
 
 function slxAddSubnetRow(e, lid) {
 	var tr = $('#loc-sub-' + lid);
-	tr.before('<tr>\
+	tr.before('<tr class="cidrmagic">\
 		<td>#</td>\
-		<td><input class="form-control" type="text" name="newstartaddr[' + slxAddCounter + ']" pattern="\\d{1,3}\.\\d{1,3}\.\\d{1,3}\.\\d{1,3}"></td>\
-		<td><input class="form-control" type="text" name="newendaddr[' + slxAddCounter + ']" pattern="\\d{1,3}\.\\d{1,3}\.\\d{1,3}\.\\d{1,3}"></td>\
+		<td><input class="form-control cidrstart" type="text" name="newstartaddr[' + slxAddCounter + ']" pattern="\\d{1,3}\.\\d{1,3}\.\\d{1,3}\.\\d{1,3}"></td>\
+		<td><input class="form-control cidrend" type="text" name="newendaddr[' + slxAddCounter + ']" pattern="\\d{1,3}\.\\d{1,3}\.\\d{1,3}\.\\d{1,3}"></td>\
 		<td></td>\
 	</tr>');
 	slxAddCounter++;
+	slxAttachCidr();
 }
 
 function slxConfirm() {
diff --git a/modules-available/locations/templates/subnets.html b/modules-available/locations/templates/subnets.html
index 2294f42b..0320e333 100644
--- a/modules-available/locations/templates/subnets.html
+++ b/modules-available/locations/templates/subnets.html
@@ -14,10 +14,10 @@
 				<th>{{lang_location}}</th>
 			</tr>
 			{{#list}}
-				<tr>
+				<tr class="cidrmagic">
 					<td>{{subnetid}}</td>
-					<td><input class="form-control" type="text" name="startaddr[{{subnetid}}]" value="{{startaddr}}"></td>
-					<td><input class="form-control" type="text" name="endaddr[{{subnetid}}]" value="{{endaddr}}"></td>
+					<td><input class="form-control cidrstart" type="text" name="startaddr[{{subnetid}}]" value="{{startaddr}}"></td>
+					<td><input class="form-control cidrend" type="text" name="endaddr[{{subnetid}}]" value="{{endaddr}}"></td>
 					<td>
 						<select class="form-control" name="location[{{subnetid}}]">
 							{{#locations}}