From d033483d3ed9e05f1109a3713ec6a3df883a1dae Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Fri, 7 Apr 2017 15:49:54 +0200
Subject: [permission-manager] renamed some files, moved html generation to
 templates, using bind variables in mysql code, changed order of modules in
 role editor

---
 .../templates/locationsTable.html                  |  25 ----
 .../templates/locationstable.html                  |  25 ++++
 .../templates/modulepermissionbox.html             |  11 ++
 .../permissionmanager/templates/permission.html    |   6 +
 .../templates/permissiontreenode.html              |  11 ++
 .../permissionmanager/templates/roleEditor.html    | 148 -------------------
 .../permissionmanager/templates/roleeditor.html    | 147 +++++++++++++++++++
 .../permissionmanager/templates/rolesTable.html    |  65 ---------
 .../permissionmanager/templates/rolestable.html    |  65 +++++++++
 .../permissionmanager/templates/usersTable.html    | 160 ---------------------
 .../permissionmanager/templates/userstable.html    | 160 +++++++++++++++++++++
 11 files changed, 425 insertions(+), 398 deletions(-)
 delete mode 100644 modules-available/permissionmanager/templates/locationsTable.html
 create mode 100644 modules-available/permissionmanager/templates/locationstable.html
 create mode 100644 modules-available/permissionmanager/templates/modulepermissionbox.html
 create mode 100644 modules-available/permissionmanager/templates/permission.html
 create mode 100644 modules-available/permissionmanager/templates/permissiontreenode.html
 delete mode 100644 modules-available/permissionmanager/templates/roleEditor.html
 create mode 100644 modules-available/permissionmanager/templates/roleeditor.html
 delete mode 100644 modules-available/permissionmanager/templates/rolesTable.html
 create mode 100644 modules-available/permissionmanager/templates/rolestable.html
 delete mode 100644 modules-available/permissionmanager/templates/usersTable.html
 create mode 100644 modules-available/permissionmanager/templates/userstable.html

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

diff --git a/modules-available/permissionmanager/templates/locationsTable.html b/modules-available/permissionmanager/templates/locationsTable.html
deleted file mode 100644
index e170cd02..00000000
--- a/modules-available/permissionmanager/templates/locationsTable.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="row">
-	<div class="col-md-12">
-		<table id="locationsTable" class="table table-condensed table-hover">
-			<thead>
-				<tr>
-					<th data-sort="string">{{lang_Locations}}</th>
-					<th>{{lang_Roles}}</th>
-				</tr>
-			</thead>
-
-			<tbody>
-				{{#location}}
-				<tr>
-					<td>{{name}}</td>
-					<td>
-						{{#role}}
-						<span class="label label-default customSpanMargin">{{.}}</span>
-						{{/role}}
-					</td>
-				</tr>
-			{{/location}}
-			</tbody>
-		</table>
-	</div>
-</div>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/locationstable.html b/modules-available/permissionmanager/templates/locationstable.html
new file mode 100644
index 00000000..e170cd02
--- /dev/null
+++ b/modules-available/permissionmanager/templates/locationstable.html
@@ -0,0 +1,25 @@
+<div class="row">
+	<div class="col-md-12">
+		<table id="locationsTable" class="table table-condensed table-hover">
+			<thead>
+				<tr>
+					<th data-sort="string">{{lang_Locations}}</th>
+					<th>{{lang_Roles}}</th>
+				</tr>
+			</thead>
+
+			<tbody>
+				{{#location}}
+				<tr>
+					<td>{{name}}</td>
+					<td>
+						{{#role}}
+						<span class="label label-default customSpanMargin">{{.}}</span>
+						{{/role}}
+					</td>
+				</tr>
+			{{/location}}
+			</tbody>
+		</table>
+	</div>
+</div>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/modulepermissionbox.html b/modules-available/permissionmanager/templates/modulepermissionbox.html
new file mode 100644
index 00000000..d298409b
--- /dev/null
+++ b/modules-available/permissionmanager/templates/modulepermissionbox.html
@@ -0,0 +1,11 @@
+<div id='{{id}}' class='panel panel-primary module-box' style='display: none;'>
+	<div class='panel-heading'>
+		<div class='checkbox'>
+			<input name='permissions[]' value='{{id}}.*' type='checkbox' class='form-control'>
+			<label>{{name}}</label>
+		</div>
+	</div>
+	<div class='panel-body'>
+		{{{HTML}}}
+	</div>
+</div>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/permission.html b/modules-available/permissionmanager/templates/permission.html
new file mode 100644
index 00000000..3cc0bf97
--- /dev/null
+++ b/modules-available/permissionmanager/templates/permission.html
@@ -0,0 +1,6 @@
+<li class='list-group-item'>
+	<div class='checkbox'>
+		<input name='permissions[]' value='{{id}}' type='checkbox' class='form-control'>
+		<label>{{name}} - {{description}}</label>
+	</div>
+</li>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/permissiontreenode.html b/modules-available/permissionmanager/templates/permissiontreenode.html
new file mode 100644
index 00000000..e9656902
--- /dev/null
+++ b/modules-available/permissionmanager/templates/permissiontreenode.html
@@ -0,0 +1,11 @@
+<ul class='list-group'>
+	<li class='list-group-item'>
+		<div class='checkbox'>
+			<input name='permissions[]' value='{{id}}.*' type='checkbox' class='form-control'>
+			<label>{{name}}</label>
+		</div>
+		<ul class='list-group'>
+			{{{HTML}}}
+		</ul>
+	</li>
+</ul>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/roleEditor.html b/modules-available/permissionmanager/templates/roleEditor.html
deleted file mode 100644
index ee717fe6..00000000
--- a/modules-available/permissionmanager/templates/roleEditor.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<form method="post" action="?do=permissionmanager">
-	<input type="hidden" name="action" value="saveRole">
-	<input type="hidden" name="token" value="{{token}}">
-	<input type="hidden" name="roleid" value="{{roleid}}">
-	<div class="row">
-		<div class="col-md-12">
-			<b>{{lang_Name}}:</b>
-			<input name="roleName" value="{{roleName}}" type="text" id="roleName" class="form-control">
-			<button type="button" id="cancelButton" class="btn btn-default pull-right"><span class="glyphicon glyphicon-remove"></span> {{lang_Cancel}}</button>
-			<button type="submit" id="saveButton" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_Save}}</button>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-3">
-			<b style="line-height: 34px">{{lang_Locations}}:</b>
-			<div class="pull-right"><input name="allLocations" {{allLocChecked}} type="checkbox" id="allLocations"></div>
-		</div>
-		<div id="selectize-container" class="col-md-9 text-left {{selectizeClass}}">
-			<select multiple name="locations[]" id="select-location">
-				<option value></option>
-				{{#locations}}
-				<option value="{{locid}}" {{selected}}>{{locName}}</option>
-				{{/locations}}
-			</select>
-		</div>
-	</div>
-	{{abc}}
-	<div class="row">
-		<div class="col-md-3">
-			<b style="line-height: 34px">{{lang_Permissions}}:</b>
-			<div class="pull-right"><input name="allPermissions" {{allPermChecked}} type="checkbox" id="allPermissions"></div>
-			<div class="btn-group-vertical module-toggle-group permissions-container {{permissionsClass}}" role="group">
-				{{#moduleNames}}
-				<button id="button-{{id}}" type="button" class="btn btn-default module-toggle" data-moduleid="{{id}}">{{name}}</button>
-				{{/moduleNames}}
-			</div>
-		</div>
-		<div class="col-md-9 module-container permissions-container {{permissionsClass}}">
-			{{{permissionHTML}}}
-		</div>
-	</div>
-</form>
-
-<script type="application/javascript">
-
-	selectedPermissions = "{{selectedPermissions}}";
-
-	document.addEventListener("DOMContentLoaded", function () {
-		$('#select-location').selectize({
-			allowEmptyOption: false,
-			maxItems: null,
-			highlight: false,
-			hideSelected: true,
-			create: false,
-			plugins: [ "remove_button" ]
-		});
-
-		var allLocations = $("#allLocations");
-		allLocations.bootstrapSwitch("size", "normal");
-		allLocations.bootstrapSwitch("labelWidth", 1);
-		allLocations.bootstrapSwitch("onText", "{{lang_all}}");
-		allLocations.bootstrapSwitch("offText", "{{lang_selected}}");
-
-		allLocations.on('switchChange.bootstrapSwitch', function(event, state) {
-			if (state) {
-				$("#selectize-container").addClass("disabled");
-			} else {
-				$("#selectize-container").removeClass("disabled");
-			}
-		});
-
-		var allPermissions = $("#allPermissions");
-		allPermissions.bootstrapSwitch("size", "normal");
-		allPermissions.bootstrapSwitch("labelWidth", 1);
-		allPermissions.bootstrapSwitch("onText", "{{lang_all}}");
-		allPermissions.bootstrapSwitch("offText", "{{lang_selected}}");
-
-
-		allPermissions.on('switchChange.bootstrapSwitch', function(event, state) {
-			if (state) {
-				$(".permissions-container").addClass("disabled");
-			} else {
-				$(".permissions-container").removeClass("disabled");
-			}
-		});
-
-		$("form input").keydown(function(e) {
-			if (e.keyCode === 13) e.preventDefault();
-		});
-
-		$(".module-toggle").click(function () {
-			var button = $(this);
-			var moduleBox = $("#" + button.data("moduleid"));
-			if (button.hasClass("btn-default")) {
-				button.removeClass("btn-default");
-				button.addClass("btn-primary");
-				moduleBox.show();
-			} else {
-				button.removeClass("btn-primary");
-				button.addClass("btn-default");
-				moduleBox.hide();
-			}
-		});
-
-		$(".module-container input[type=checkbox]").change(function () {
-			var parent = $(this).parent().parent();
-			if (parent.hasClass("panel-heading")) parent = parent.parent();
-			parent = parent.find("ul:first");
-			parent.find("ul").removeClass("disabled");
-			var checkboxes = parent.find("input[type=checkbox]");
-			if (parent.hasClass("disabled")) {
-				checkboxes.prop("disabled", false);
-				checkboxes.prop("checked", false);
-				parent.removeClass("disabled");
-			} else {
-				checkboxes.prop("disabled", true);
-				checkboxes.prop("checked", true);
-				parent.addClass("disabled");
-			}
-		});
-		
-		$("#cancelButton").click(function () {
-			window.location.replace("?do=permissionmanager&show=roles");
-		});
-
-		$('form').submit(function () {
-			var name = $.trim($('#roleName').val());
-			if (name  === '') {
-				alert('{{lang_emptyNameWarning}}');
-				return false;
-			}
-		});
-
-		var permissions = selectedPermissions.split(" ");
-		var arrayLength = permissions.length;
-		for (var i = 0; i < arrayLength; i++) {
-			var checkbox = $("input[type=checkbox][value='"+permissions[i]+"']");
-			checkbox.trigger('change').attr('checked', 'checked');
-			var moduleBox = checkbox.closest(".module-box");
-			moduleBox.show();
-			var button = $("#button-"+moduleBox.attr('id'));
-			button.removeClass("btn-default");
-			button.addClass("btn-primary");
-		}
-
-	});
-
-</script>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html
new file mode 100644
index 00000000..7de8eaf3
--- /dev/null
+++ b/modules-available/permissionmanager/templates/roleeditor.html
@@ -0,0 +1,147 @@
+<form method="post" action="?do=permissionmanager">
+	<input type="hidden" name="action" value="saveRole">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="roleid" value="{{roleid}}">
+	<div class="row">
+		<div class="col-md-12">
+			<b>{{lang_Name}}:</b>
+			<input name="roleName" value="{{roleName}}" type="text" id="roleName" class="form-control">
+			<button type="button" id="cancelButton" class="btn btn-default pull-right"><span class="glyphicon glyphicon-remove"></span> {{lang_Cancel}}</button>
+			<button type="submit" id="saveButton" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_Save}}</button>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-md-3">
+			<b style="line-height: 34px">{{lang_Locations}}:</b>
+			<div class="pull-right"><input name="allLocations" {{allLocChecked}} type="checkbox" id="allLocations"></div>
+		</div>
+		<div id="selectize-container" class="col-md-9 text-left {{selectizeClass}}">
+			<select multiple name="locations[]" id="select-location">
+				<option value></option>
+				{{#locations}}
+				<option value="{{locid}}" {{selected}}>{{locName}}</option>
+				{{/locations}}
+			</select>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-md-3">
+			<b style="line-height: 34px">{{lang_Permissions}}:</b>
+			<div class="pull-right"><input name="allPermissions" {{allPermChecked}} type="checkbox" id="allPermissions"></div>
+			<div class="btn-group-vertical module-toggle-group permissions-container {{permissionsClass}}" role="group">
+				{{#moduleNames}}
+				<button id="button-{{id}}" type="button" class="btn btn-default module-toggle" data-moduleid="{{id}}">{{name}}</button>
+				{{/moduleNames}}
+			</div>
+		</div>
+		<div class="col-md-9 module-container permissions-container {{permissionsClass}}">
+			{{{permissionHTML}}}
+		</div>
+	</div>
+</form>
+
+<script type="application/javascript">
+
+	selectedPermissions = "{{selectedPermissions}}";
+
+	document.addEventListener("DOMContentLoaded", function () {
+		$('#select-location').selectize({
+			allowEmptyOption: false,
+			maxItems: null,
+			highlight: false,
+			hideSelected: true,
+			create: false,
+			plugins: [ "remove_button" ]
+		});
+
+		var allLocations = $("#allLocations");
+		allLocations.bootstrapSwitch("size", "normal");
+		allLocations.bootstrapSwitch("labelWidth", 1);
+		allLocations.bootstrapSwitch("onText", "{{lang_all}}");
+		allLocations.bootstrapSwitch("offText", "{{lang_selected}}");
+
+		allLocations.on('switchChange.bootstrapSwitch', function(event, state) {
+			if (state) {
+				$("#selectize-container").addClass("disabled");
+			} else {
+				$("#selectize-container").removeClass("disabled");
+			}
+		});
+
+		var allPermissions = $("#allPermissions");
+		allPermissions.bootstrapSwitch("size", "normal");
+		allPermissions.bootstrapSwitch("labelWidth", 1);
+		allPermissions.bootstrapSwitch("onText", "{{lang_all}}");
+		allPermissions.bootstrapSwitch("offText", "{{lang_selected}}");
+
+
+		allPermissions.on('switchChange.bootstrapSwitch', function(event, state) {
+			if (state) {
+				$(".permissions-container").addClass("disabled");
+			} else {
+				$(".permissions-container").removeClass("disabled");
+			}
+		});
+
+		$("form input").keydown(function(e) {
+			if (e.keyCode === 13) e.preventDefault();
+		});
+
+		$(".module-toggle").click(function () {
+			var button = $(this);
+			var moduleBox = $("#" + button.data("moduleid"));
+			if (button.hasClass("btn-default")) {
+				button.removeClass("btn-default");
+				button.addClass("btn-primary");
+				moduleBox.show();
+			} else {
+				button.removeClass("btn-primary");
+				button.addClass("btn-default");
+				moduleBox.hide();
+			}
+		});
+
+		$(".module-container input[type=checkbox]").change(function () {
+			var parent = $(this).parent().parent();
+			if (parent.hasClass("panel-heading")) parent = parent.parent();
+			parent = parent.find("ul:first");
+			parent.find("ul").removeClass("disabled");
+			var checkboxes = parent.find("input[type=checkbox]");
+			if (parent.hasClass("disabled")) {
+				checkboxes.prop("disabled", false);
+				checkboxes.prop("checked", false);
+				parent.removeClass("disabled");
+			} else {
+				checkboxes.prop("disabled", true);
+				checkboxes.prop("checked", true);
+				parent.addClass("disabled");
+			}
+		});
+		
+		$("#cancelButton").click(function () {
+			window.location.replace("?do=permissionmanager&show=roles");
+		});
+
+		$('form').submit(function () {
+			var name = $.trim($('#roleName').val());
+			if (name  === '') {
+				alert('{{lang_emptyNameWarning}}');
+				return false;
+			}
+		});
+
+		var permissions = selectedPermissions.split(" ");
+		var arrayLength = permissions.length;
+		for (var i = 0; i < arrayLength; i++) {
+			var checkbox = $("input[type=checkbox][value='"+permissions[i]+"']");
+			checkbox.trigger('change').attr('checked', 'checked');
+			var moduleBox = checkbox.closest(".module-box");
+			moduleBox.show();
+			var button = $("#button-"+moduleBox.attr('id'));
+			button.removeClass("btn-default");
+			button.addClass("btn-primary");
+		}
+
+	});
+
+</script>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/rolesTable.html b/modules-available/permissionmanager/templates/rolesTable.html
deleted file mode 100644
index 40cdda96..00000000
--- a/modules-available/permissionmanager/templates/rolesTable.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<form method="post" action="?do=permissionmanager">
-	<input type="hidden" name="token" value="{{token}}">
-
-	<button class="btn btn-success" type="button" onclick="openRoleEditor()"><span class="glyphicon glyphicon-plus"></span> {{lang_newRole}}</button>
-
-	<div class="row">
-		<div class="col-md-12">
-			<table id="rolesTable" class="table table-condensed table-hover">
-				<thead>
-					<tr>
-						<th data-sort="string">{{lang_Roles}}</th>
-						<th>{{lang_Edit}}</th>
-						<th>{{lang_Delete}}</th>
-					</tr>
-				</thead>
-
-				<tbody>
-				{{#roles}}
-					<tr>
-						<td>{{roleName}}</td>
-						<td>
-							<a href="?do=permissionmanager&show=roleEditor&roleid={{roleId}}">{{lang_Edit}}</a>
-						</td>
-						<td>
-							<a href="#deleteModal" data-toggle="modal" data-target="#deleteModal" onclick="deleteRole('{{roleId}}')">{{lang_Delete}}</a>
-						</td>
-					</tr>
-				{{/roles}}
-				</tbody>
-			</table>
-		</div>
-	</div>
-
-
-	<!-- Modals -->
-	<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">{{lang_Delete}}</h4>
-				</div>
-				<div class="modal-body">
-					{{lang_deleteCheck}}
-				</div>
-				<div class="modal-footer">
-					<input type="hidden" id="deleteId" name="deleteId" value=""/>
-					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" name="action" value="deleteRole" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_Delete}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-</form>
-
-<script>
-	function openRoleEditor() {
-		window.location.href = "?do=permissionmanager&show=roleEditor"
-	}
-
-	function deleteRole($roleId) {
-		$(".modal-footer #deleteId").val($roleId);
-	}
-</script>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/rolestable.html b/modules-available/permissionmanager/templates/rolestable.html
new file mode 100644
index 00000000..40cdda96
--- /dev/null
+++ b/modules-available/permissionmanager/templates/rolestable.html
@@ -0,0 +1,65 @@
+<form method="post" action="?do=permissionmanager">
+	<input type="hidden" name="token" value="{{token}}">
+
+	<button class="btn btn-success" type="button" onclick="openRoleEditor()"><span class="glyphicon glyphicon-plus"></span> {{lang_newRole}}</button>
+
+	<div class="row">
+		<div class="col-md-12">
+			<table id="rolesTable" class="table table-condensed table-hover">
+				<thead>
+					<tr>
+						<th data-sort="string">{{lang_Roles}}</th>
+						<th>{{lang_Edit}}</th>
+						<th>{{lang_Delete}}</th>
+					</tr>
+				</thead>
+
+				<tbody>
+				{{#roles}}
+					<tr>
+						<td>{{roleName}}</td>
+						<td>
+							<a href="?do=permissionmanager&show=roleEditor&roleid={{roleId}}">{{lang_Edit}}</a>
+						</td>
+						<td>
+							<a href="#deleteModal" data-toggle="modal" data-target="#deleteModal" onclick="deleteRole('{{roleId}}')">{{lang_Delete}}</a>
+						</td>
+					</tr>
+				{{/roles}}
+				</tbody>
+			</table>
+		</div>
+	</div>
+
+
+	<!-- Modals -->
+	<div class ="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+					<h4 class="modal-title" id="myModalLabel">{{lang_Delete}}</h4>
+				</div>
+				<div class="modal-body">
+					{{lang_deleteCheck}}
+				</div>
+				<div class="modal-footer">
+					<input type="hidden" id="deleteId" name="deleteId" value=""/>
+					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+					<button type="submit" name="action" value="deleteRole" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> {{lang_Delete}}</button>
+				</div>
+			</div>
+		</div>
+	</div>
+
+</form>
+
+<script>
+	function openRoleEditor() {
+		window.location.href = "?do=permissionmanager&show=roleEditor"
+	}
+
+	function deleteRole($roleId) {
+		$(".modal-footer #deleteId").val($roleId);
+	}
+</script>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/usersTable.html b/modules-available/permissionmanager/templates/usersTable.html
deleted file mode 100644
index 3db1ebdb..00000000
--- a/modules-available/permissionmanager/templates/usersTable.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<form method="post" action="?do=permissionmanager">
-	<input type="hidden" name="token" value="{{token}}">
-	<button class="btn btn-success" type="button" data-toggle="modal" data-target="#addRoleToUserModal"><span class="glyphicon glyphicon-share-alt"></span> {{lang_addRole}}</button>
-	<button class="btn btn-danger" type="button" data-toggle="modal" data-target="#removeRoleFromUserModal"><span class="glyphicon glyphicon-trash"></span> {{lang_removeRole}}</button>
-
-	<div class="row">
-		<div class="col-md-12">
-			<table id="usersTable" class="table table-condensed table-hover">
-				<thead>
-					<tr>
-						<th data-sort="string">{{lang_Users}}</th>
-						<th>{{lang_Roles}}</th>
-						<th data-sort="int" data-sort-default="desc">{{lang_Selected}}</th>
-					</tr>
-				</thead>
-
-				<tbody>
-				{{#user}}
-				<tr>
-					<td>{{name}}</td>
-					<td>
-						{{#role}}
-						<span class="label label-default customSpanMargin">{{.}}</span>
-						{{/role}}
-					</td>
-					<td data-sort-value="0">
-						<div class="checkbox">
-							<input id="{{userid}}" type="checkbox" name="users[]" value='{{userid}}'>
-							<label for="{{userid}}"></label>
-						</div>
-					</td>
-				</tr>
-				{{/user}}
-				</tbody>
-			</table>
-		</div>
-	</div>
-
-	<!-- Modals -->
-	<div class ="modal fade" id="addRoleToUserModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">{{lang_addRole}}</h4>
-				</div>
-				<div class="modal-body">
-					<div class="row">
-						<div class="col-md-12 scrollingTable">
-							<table id="addRoleToUserTable" class="table table-condensed table-hover">
-								<thead>
-									<tr>
-										<th data-sort="string">{{lang_Roles}}</th>
-										<th data-sort="int" data-sort-default="desc">{{lang_Selected}}</th>
-									</tr>
-								</thead>
-
-									<tbody>
-									{{#roles}}
-									<tr>
-										<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>
-											</div>
-										</td>
-									</tr>
-									{{/roles}}
-									</tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" name="action" value="addRoleToUser" class="btn btn-success"  onclick="clearRemoveRoleModal()"><span class="glyphicon glyphicon-share-alt"></span> {{lang_addRole}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class ="modal fade" id="removeRoleFromUserModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel2">{{lang_Remove}}</h4>
-				</div>
-				<div class="modal-body">
-					<div class="row">
-						<div class="col-md-12 scrollingTable">
-							<table id="removeRoleFromUserTable" class="table table-condensed table-hover">
-								<thead>
-								<tr>
-									<th data-sort="string">{{lang_Roles}}</th>
-									<th data-sort="int" data-sort-default="desc">{{lang_Selected}}</th>
-								</tr>
-								</thead>
-
-								<tbody>
-								{{#roles}}
-								<tr>
-									<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>
-										</div>
-									</td>
-								</tr>
-								{{/roles}}
-								</tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" name="action" value="removeRoleFromUser" class="btn btn-danger" onclick="clearAddRoleModal()"><span class="glyphicon glyphicon-trash"></span> {{lang_Remove}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-</form>
-
-<script>
-	document.addEventListener("DOMContentLoaded", function() {
-		// if checked,: mark green, else: unmark
-		$('input:checkbox').change(function() {
-			if ($(this).is(':checked')) {
-				$(this).closest("td").data("sort-value", 1);
-				$(this).closest("tr").css("background-color", "#f2ffe6");
-			} else {
-				$(this).closest("td").data("sort-value", 0);
-				$(this).closest("tr").css("background-color", "");
-			}
-
-		});
-
-	});
-
-
-	// if remove-Role button is clicked, uncheck all checkboxes in add-role modal so they aren't submitted too
-	function clearAddRoleModal () {
-		$('#addRoleToUserModal')
-			.find("input[type=checkbox]")
-			.prop("checked", "")
-			.end();
-	}
-
-	// if add-Role button is clicked, uncheck all checkboxes in remove-role modal so they aren't submitted too
-	function clearRemoveRoleModal() {
-		$('#removeRoleFromUserModal')
-			.find("input[type=checkbox]")
-			.prop("checked", "")
-			.end();
-	}
-
-</script>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/userstable.html b/modules-available/permissionmanager/templates/userstable.html
new file mode 100644
index 00000000..3db1ebdb
--- /dev/null
+++ b/modules-available/permissionmanager/templates/userstable.html
@@ -0,0 +1,160 @@
+<form method="post" action="?do=permissionmanager">
+	<input type="hidden" name="token" value="{{token}}">
+	<button class="btn btn-success" type="button" data-toggle="modal" data-target="#addRoleToUserModal"><span class="glyphicon glyphicon-share-alt"></span> {{lang_addRole}}</button>
+	<button class="btn btn-danger" type="button" data-toggle="modal" data-target="#removeRoleFromUserModal"><span class="glyphicon glyphicon-trash"></span> {{lang_removeRole}}</button>
+
+	<div class="row">
+		<div class="col-md-12">
+			<table id="usersTable" class="table table-condensed table-hover">
+				<thead>
+					<tr>
+						<th data-sort="string">{{lang_Users}}</th>
+						<th>{{lang_Roles}}</th>
+						<th data-sort="int" data-sort-default="desc">{{lang_Selected}}</th>
+					</tr>
+				</thead>
+
+				<tbody>
+				{{#user}}
+				<tr>
+					<td>{{name}}</td>
+					<td>
+						{{#role}}
+						<span class="label label-default customSpanMargin">{{.}}</span>
+						{{/role}}
+					</td>
+					<td data-sort-value="0">
+						<div class="checkbox">
+							<input id="{{userid}}" type="checkbox" name="users[]" value='{{userid}}'>
+							<label for="{{userid}}"></label>
+						</div>
+					</td>
+				</tr>
+				{{/user}}
+				</tbody>
+			</table>
+		</div>
+	</div>
+
+	<!-- Modals -->
+	<div class ="modal fade" id="addRoleToUserModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+					<h4 class="modal-title" id="myModalLabel">{{lang_addRole}}</h4>
+				</div>
+				<div class="modal-body">
+					<div class="row">
+						<div class="col-md-12 scrollingTable">
+							<table id="addRoleToUserTable" class="table table-condensed table-hover">
+								<thead>
+									<tr>
+										<th data-sort="string">{{lang_Roles}}</th>
+										<th data-sort="int" data-sort-default="desc">{{lang_Selected}}</th>
+									</tr>
+								</thead>
+
+									<tbody>
+									{{#roles}}
+									<tr>
+										<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>
+											</div>
+										</td>
+									</tr>
+									{{/roles}}
+									</tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+					<button type="submit" name="action" value="addRoleToUser" class="btn btn-success"  onclick="clearRemoveRoleModal()"><span class="glyphicon glyphicon-share-alt"></span> {{lang_addRole}}</button>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class ="modal fade" id="removeRoleFromUserModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+					<h4 class="modal-title" id="myModalLabel2">{{lang_Remove}}</h4>
+				</div>
+				<div class="modal-body">
+					<div class="row">
+						<div class="col-md-12 scrollingTable">
+							<table id="removeRoleFromUserTable" class="table table-condensed table-hover">
+								<thead>
+								<tr>
+									<th data-sort="string">{{lang_Roles}}</th>
+									<th data-sort="int" data-sort-default="desc">{{lang_Selected}}</th>
+								</tr>
+								</thead>
+
+								<tbody>
+								{{#roles}}
+								<tr>
+									<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>
+										</div>
+									</td>
+								</tr>
+								{{/roles}}
+								</tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+					<button type="submit" name="action" value="removeRoleFromUser" class="btn btn-danger" onclick="clearAddRoleModal()"><span class="glyphicon glyphicon-trash"></span> {{lang_Remove}}</button>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
+
+<script>
+	document.addEventListener("DOMContentLoaded", function() {
+		// if checked,: mark green, else: unmark
+		$('input:checkbox').change(function() {
+			if ($(this).is(':checked')) {
+				$(this).closest("td").data("sort-value", 1);
+				$(this).closest("tr").css("background-color", "#f2ffe6");
+			} else {
+				$(this).closest("td").data("sort-value", 0);
+				$(this).closest("tr").css("background-color", "");
+			}
+
+		});
+
+	});
+
+
+	// if remove-Role button is clicked, uncheck all checkboxes in add-role modal so they aren't submitted too
+	function clearAddRoleModal () {
+		$('#addRoleToUserModal')
+			.find("input[type=checkbox]")
+			.prop("checked", "")
+			.end();
+	}
+
+	// if add-Role button is clicked, uncheck all checkboxes in remove-role modal so they aren't submitted too
+	function clearRemoveRoleModal() {
+		$('#removeRoleFromUserModal')
+			.find("input[type=checkbox]")
+			.prop("checked", "")
+			.end();
+	}
+
+</script>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522