From 8aebf6191f0942b6e0fbdc5b07f8069a68d3ee70 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 14 Feb 2018 13:18:47 +0100
Subject: [locations] One permission for direct subnet editing; restructure
 handling a bit

---
 .../locations/templates/location-subnets.html      | 33 ++++++++++------------
 .../locations/templates/locations.html             | 30 ++++++++++++--------
 2 files changed, 33 insertions(+), 30 deletions(-)

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

diff --git a/modules-available/locations/templates/location-subnets.html b/modules-available/locations/templates/location-subnets.html
index 2cc8e98b..9db75f0b 100644
--- a/modules-available/locations/templates/location-subnets.html
+++ b/modules-available/locations/templates/location-subnets.html
@@ -8,17 +8,17 @@
 			<button type="submit" class="btn btn-primary">Save</button>
 		</div>
 		<div class="row">
-			<div class="{{^editAllowed}}disabled{{/editAllowed}}">
+			<div>
 				<div class="col-sm-6">
 					<div class="input-group">
 						<span class="input-group-addon slx-ga">{{lang_name}}</span>
-						<input class="form-control" type="text" name="locationname" value="{{locationname}}" pattern=".*\S.*">
+						<input {{perms.location.edit.name.disabled}} class="form-control" type="text" name="locationname" value="{{locationname}}" pattern=".*\S.*">
 					</div>
 				</div>
 				<div class="col-sm-6">
 					<div class="input-group">
 						<span class="input-group-addon slx-ga2">{{lang_parentLocation}}</span>
-						<select class="form-control" name="parentlocationid">
+						<select class="form-control" name="parentlocationid" {{perms.location.edit.parent.disabled}}>
 							{{#parents}}
 							<option {{disabled}} value="{{locationid}}" {{#selected}}selected="selected"{{/selected}}>{{locationpad}} {{locationname}}</option>
 							{{/parents}}
@@ -40,11 +40,11 @@
 			{{#list}}
 				<tr class="cidrmagic">
 					<td>{{subnetid}}</td>
-					<td class="{{^editSubnetAllowed}}disabled{{/editSubnetAllowed}}"><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 class="{{^editSubnetAllowed}}disabled{{/editSubnetAllowed}}"><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><input {{perms.location.edit.subnets.disabled}} 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 {{perms.location.edit.subnets.disabled}} 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">
 						<div class="checkbox text-center" style="margin-left: 9px">
-							<input {{^deleteSubnetAllowed}}disabled{{/deleteSubnetAllowed}} type="checkbox" name="deletesubnet[{{subnetid}}]" value="on">
+							<input {{perms.location.edit.subnets.disabled}} type="checkbox" name="deletesubnet[{{subnetid}}]" value="on">
 							<label class="text-left"></label>
 						</div>
 					</td>
@@ -52,7 +52,7 @@
 			{{/list}}
 			<tr id="loc-sub-{{locationid}}">
 				<td colspan="4">
-					<button {{^addSubnetAllowed}}disabled{{/addSubnetAllowed}} class="btn btn-success btn-sm pull-right" type="button" onclick="slxAddSubnetRow(this, {{locationid}})" title="{{lang_addNewSubnet}}">
+					<button {{perms.location.edit.subnets.disabled}} class="btn btn-success btn-sm pull-right" type="button" onclick="slxAddSubnetRow(this, {{locationid}})" title="{{lang_addNewSubnet}}">
 						<span class="glyphicon glyphicon-plus"></span> {{lang_subnet}}
 					</button>
 				</td>
@@ -74,19 +74,16 @@
 				{{/haveStatistics}}
 			</div>
 			<div class="col-md-4 text-center">
-				<div class="btn-group">
-					{{#roomplanner}}
-					<a class="btn btn-default" href="?do=roomplanner&amp;locationid={{locationid}}" target="_blank"
-						onclick="window.open(this.href, '_blank', 'toolbar=0,scrollbars,resizable');return false">
-						<span class="glyphicon glyphicon-move"></span> {{lang_editRoomplan}}
-					</a>
-					{{/roomplanner}}
-				</div>
-
+				{{#roomplanner}}
+				<a class="btn btn-default {{perms.roomplanner.edit.disabled}}" href="?do=roomplanner&amp;locationid={{locationid}}" target="_blank"
+					onclick="window.open(this.href, '_blank', 'toolbar=0,scrollbars,resizable');return false">
+					<span class="glyphicon glyphicon-move"></span> {{lang_editRoomplan}}
+				</a>
+				{{/roomplanner}}
 			</div>
 			<div class="col-md-4 text-right">
-				<button style="margin-right: 10px" {{^deleteAllowed}}disabled{{/deleteAllowed}} type="button" class="btn btn-danger"  data-toggle="modal" data-target="#deleteLocationModal{{locationid}}"><span class="glyphicon glyphicon-trash"></span> {{lang_deleteLocation}}</button>
-				<button onclick="deleteSubnetWarning('{{locationid}}')" {{^saveButton}}disabled{{/saveButton}} type="button" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+				<button {{perms.location.delete.disabled}} type="button" class="btn btn-danger"  data-toggle="modal" data-target="#deleteLocationModal{{locationid}}"><span class="glyphicon glyphicon-trash"></span> {{lang_deleteLocation}}</button>
+				<button onclick="deleteSubnetWarning('{{locationid}}')" {{perms.save_button.disabled}} type="button" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
 			</div>
 		</div>
 
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index be3d5115..cd04b1c8 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -1,7 +1,13 @@
 <div>
 	<div class="btn-group pull-right">
-		<a href="?do=Locations&amp;action=showlocations" class="btn btn-default active"><span class="glyphicon glyphicon-home"></span> {{lang_thisListByLocation}}</a>
-		<a href="?do=Locations&amp;action=showsubnets" class="btn btn-default"><span class="glyphicon glyphicon-list-alt"></span> {{lang_thisListBySubnet}}</a>
+		<a href="?do=Locations&amp;action=showlocations" class="btn btn-default active">
+			<span class="glyphicon glyphicon-home"></span>
+			{{lang_thisListByLocation}}
+		</a>
+		<a href="?do=Locations&amp;action=showsubnets" class="btn btn-default {{perms.subnets.edit.disabled}}">
+			<span class="glyphicon glyphicon-list-alt"></span>
+			{{lang_thisListBySubnet}}
+		</a>
 	</div>
 	<h1>{{lang_locationsMainHeading}}</h1>
 
@@ -36,10 +42,17 @@
 			<tr>
 				<td>
 					<div style="display:inline-block;width:{{depth}}em"></div>
-					<a href="#" class="{{linkClass}}" onclick="slxOpenLocation(this, {{locationid}}); return false">{{locationname}}{{^linkClass}} <b class="caret"></b>{{/linkClass}}</a>
+					{{#show-only}}
+						<span>{{locationname}}</span>
+					{{/show-only}}
+					{{^show-only}}
+						<a href="#" onclick="slxOpenLocation(this, {{locationid}}); return false">
+							{{locationname}}
+							<b class="caret"></b>
+						</a>
+					{{/show-only}}
 				</td>
 				<td class="text-nowrap" align="right">
-					{{^linkClass}}
 					{{#havestatistics}}
 						<a href="?do=Statistics&amp;show=list&amp;filters=location={{locationid}}">&nbsp;{{clientCount}}&nbsp;</a>
 					<span style="display:inline-block;width:5ex">
@@ -48,17 +61,13 @@
 					{{/hasChild}}
 					</span>
 					{{/havestatistics}}
-					{{/linkClass}}
 				</td>
 				<td class="text-nowrap" align="right">
-					{{^linkClass}}
 					{{#havestatistics}}
 					{{clientLoad}}
 					{{/havestatistics}}
-					{{/linkClass}}
 				</td>
 				<td class="text-nowrap">
-					{{^linkClass}}
 					{{#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>
@@ -67,10 +76,8 @@
 					{{lang_overrideCount}}: {{overriddenVars}}&emsp;&emsp;
 					{{/overriddenVars}}
 					{{/havebaseconfig}}
-					{{/linkClass}}
 				</td>
 				<td class="text-nowrap">
-					{{^linkClass}}
 					{{#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>
@@ -79,7 +86,6 @@
 					{{configName}}&emsp;&emsp;
 					</span>
 					{{/havesysconfig}}
-					{{/linkClass}}
 				</td>
 			</tr>
 		{{/list}}
@@ -106,7 +112,7 @@
 			<tr id="lasttr">
 				<td width="60%">&emsp;</td>
 				<td class="text-right" colspan="2">
-					<button {{^addAllowed}}disabled{{/addAllowed}} class="btn btn-success" type="button" onclick="slxAddLocationRow()">
+					<button {{perms.location.add.disabled}} class="btn btn-success" type="button" onclick="slxAddLocationRow()">
 						<span class="glyphicon glyphicon-plus"></span> {{lang_location}}
 					</button>
 					<button id="saveLocationRows" type="submit" class="btn btn-primary collapse">
-- 
cgit v1.2.3-55-g7522