[permissionmanager] added key relationships to install script;

changed nested php for loops to sql code; standardized sql column naming;
small bugfixes;

5 files changed, 24 insertions, 24 deletions

diff --git a/modules-available/permissionmanager/templates/_page.html b/modules-available/permissionmanager/templates/_page.html
index 65a52c52..ff487c8f 100644
--- a/modules-available/permissionmanager/templates/_page.html
+++ b/modules-available/permissionmanager/templates/_page.html
@@ -5,17 +5,17 @@
 				<input type="hidden" name="do" value="permissionmanager">
 
 				<div class="btn-group">
-					<button class="btn {{rolesButtonClass}}" type="submit" name="show" value="roles">
+					<button class="btn btn-default {{rolesButtonClass}}" type="submit" name="show" value="roles">
 						<span class="glyphicon glyphicon-education"></span>
 						{{lang_Roles}}
 					</button>
 
-					<button class="btn {{usersButtonClass}}" type="submit" name="show" value="users">
+					<button class="btn btn-default {{usersButtonClass}}" type="submit" name="show" value="users">
 						<span class="glyphicon glyphicon-user"></span>
 						{{lang_Users}}
 					</button>
 
-					<button class="btn {{locationsButtonClass}}" type="submit" name="show" value="locations">
+					<button class="btn btn-default {{locationsButtonClass}}" type="submit" name="show" value="locations">
 						<span class="glyphicon glyphicon-home"></span>
 						{{lang_Locations}}
 					</button>
diff --git a/modules-available/permissionmanager/templates/locationstable.html b/modules-available/permissionmanager/templates/locationstable.html
index 79b0a076..dcfefa94 100644
--- a/modules-available/permissionmanager/templates/locationstable.html
+++ b/modules-available/permissionmanager/templates/locationstable.html
@@ -3,9 +3,9 @@
 	<div class="col-md-4">
 		<select multiple name="roles[]" id="select-role">
 			<option value>{{lang_selectizePlaceholder}}</option>
-			{{#roles}}
-			<option value="{{roleId}}">{{roleName}}</option>
-			{{/roles}}
+			{{#allroles}}
+			<option value="{{roleid}}">{{rolename}}</option>
+			{{/allroles}}
 		</select>
 	</div>
 </div>
@@ -23,10 +23,10 @@
 			<tbody>
 			{{#location}}
 				<tr data-selectizeCount='0'>
-					<td>{{locname}}</td>
+					<td>{{locationpad}} {{locationname}}</td>
 					<td>
 						{{#roles}}
-						<span class="label label-default customSpanMargin roleId-{{roleId}}">{{roleName}}</span>
+						<span class="label label-default customSpanMargin roleid-{{roleid}}">{{rolename}}</span>
 						{{/roles}}
 					</td>
 				</tr>
diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html
index fd78fc54..359f09a1 100644
--- a/modules-available/permissionmanager/templates/roleeditor.html
+++ b/modules-available/permissionmanager/templates/roleeditor.html
@@ -6,7 +6,7 @@
 	<div class="row">
 		<div class="col-md-12" style="margin-bottom: 20px;">
 			<b>{{lang_Name}}:</b>
-			<input name="roleName" value="{{roleName}}" type="text" id="roleName" class="form-control">
+			<input name="rolename" value="{{rolename}}" type="text" id="rolename" class="form-control">
 			<button type="submit" id="saveButton" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_Save}}</button>
 			<button type="button" id="cancelButton" class="btn btn-default pull-right">{{lang_Cancel}}</button>
 		</div>
@@ -20,7 +20,7 @@
 			<select multiple name="locations[]" id="select-location">
 				<option value></option>
 				{{#locations}}
-				<option value="{{locid}}" {{selected}}>{{locName}}</option>
+				<option value="{{locationid}}" {{#selected}}selected{{/selected}}>{{locationpad}} {{locationname}}</option>
 				{{/locations}}
 			</select>
 		</div>
@@ -121,7 +121,7 @@
 		});
 
 		$('form').submit(function () {
-			var name = $.trim($('#roleName').val());
+			var name = $.trim($('#rolename').val());
 			if (name  === '') {
 				alert('{{lang_emptyNameWarning}}');
 				return false;
diff --git a/modules-available/permissionmanager/templates/rolestable.html b/modules-available/permissionmanager/templates/rolestable.html
index dab0faeb..99401624 100644
--- a/modules-available/permissionmanager/templates/rolestable.html
+++ b/modules-available/permissionmanager/templates/rolestable.html
@@ -24,12 +24,12 @@
 				<tbody>
 				{{#roles}}
 					<tr class="rolesRow">
-						<td class="rolesData">{{roleName}}</td>
+						<td class="rolesData">{{rolename}}</td>
 						<td class="text-center">
-							<a class="btn btn-xs btn-info" href="?do=permissionmanager&show=roleEditor&roleid={{roleId}}"><span class="glyphicon glyphicon-edit"></span></a>
+							<a class="btn btn-xs btn-info" href="?do=permissionmanager&show=roleEditor&roleid={{roleid}}"><span class="glyphicon glyphicon-edit"></span></a>
 						</td>
 						<td class="text-center">
-							<a class="btn btn-xs btn-danger" href="#deleteModal" data-toggle="modal" data-target="#deleteModal" onclick="deleteRole('{{roleId}}')"><span class="glyphicon glyphicon-trash"></span></a>
+							<a class="btn btn-xs btn-danger" href="#deleteModal" data-toggle="modal" data-target="#deleteModal" onclick="deleteRole('{{roleid}}')"><span class="glyphicon glyphicon-trash"></span></a>
 						</td>
 					</tr>
 				{{/roles}}
@@ -66,8 +66,8 @@
 		window.location.href = "?do=permissionmanager&show=roleEditor"
 	}
 
-	function deleteRole($roleId) {
-		$(".modal-footer #deleteId").val($roleId);
+	function deleteRole($roleid) {
+		$(".modal-footer #deleteId").val($roleid);
 	}
 
 	function searchFieldFunction() {
diff --git a/modules-available/permissionmanager/templates/userstable.html b/modules-available/permissionmanager/templates/userstable.html
index e794608c..bd48d16d 100644
--- a/modules-available/permissionmanager/templates/userstable.html
+++ b/modules-available/permissionmanager/templates/userstable.html
@@ -10,7 +10,7 @@
 			<select multiple name="roles[]" id="select-role">
 				<option value>{{lang_selectizePlaceholder}}</option>
 				{{#roles}}
-				<option value="{{roleId}}">{{roleName}}</option>
+				<option value="{{roleid}}">{{rolename}}</option>
 				{{/roles}}
 			</select>
 		</div>
@@ -33,7 +33,7 @@
 						<td>{{username}}</td>
 						<td>
 							{{#roles}}
-							<span class="label label-default customSpanMargin roleId-{{roleId}}">{{roleName}}</span>
+							<span class="label label-default customSpanMargin roleid-{{roleid}}">{{rolename}}</span>
 							{{/roles}}
 						</td>
 						<td data-sort-value="0">
@@ -71,11 +71,11 @@
 								<tbody>
 								{{#roles}}
 									<tr>
-										<td>{{roleName}}</td>
+										<td>{{rolename}}</td>
 										<td data-sort-value="0">
 											<div class="checkbox">
-												<input id="add{{roleId}}" type="checkbox" name="roles[]" value='{{roleId}}'>
-												<label for="add{{roleId}}"></label>
+												<input id="add{{roleid}}" type="checkbox" name="roles[]" value='{{roleid}}'>
+												<label for="add{{roleid}}"></label>
 											</div>
 										</td>
 									</tr>
@@ -114,11 +114,11 @@
 								<tbody>
 								{{#roles}}
 									<tr>
-										<td>{{roleName}}</td>
+										<td>{{rolename}}</td>
 										<td data-sort-value="0">
 											<div class="checkbox">
-												<input id="remove{{roleId}}" type="checkbox" name="roles[]" value='{{roleId}}'>
-												<label for="remove{{roleId}}"></label>
+												<input id="remove{{roleid}}" type="checkbox" name="roles[]" value='{{roleid}}'>
+												<label for="remove{{roleid}}"></label>
 											</div>
 										</td>
 									</tr>