[permission-manager] renamed some files, moved html generation to templates,

using bind variables in mysql code, changed order of modules in role editor

7 files changed, 28 insertions, 1 deletions

diff --git a/modules-available/permissionmanager/templates/locationsTable.html b/modules-available/permissionmanager/templates/locationstable.html
index e170cd02..e170cd02 100644
--- a/modules-available/permissionmanager/templates/locationsTable.html
+++ b/modules-available/permissionmanager/templates/locationstable.html
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
index ee717fe6..7de8eaf3 100644
--- a/modules-available/permissionmanager/templates/roleEditor.html
+++ b/modules-available/permissionmanager/templates/roleeditor.html
@@ -24,7 +24,6 @@
 			</select>
 		</div>
 	</div>
-	{{abc}}
 	<div class="row">
 		<div class="col-md-3">
 			<b style="line-height: 34px">{{lang_Permissions}}:</b>
diff --git a/modules-available/permissionmanager/templates/rolesTable.html b/modules-available/permissionmanager/templates/rolestable.html
index 40cdda96..40cdda96 100644
--- a/modules-available/permissionmanager/templates/rolesTable.html
+++ b/modules-available/permissionmanager/templates/rolestable.html
diff --git a/modules-available/permissionmanager/templates/usersTable.html b/modules-available/permissionmanager/templates/userstable.html
index 3db1ebdb..3db1ebdb 100644
--- a/modules-available/permissionmanager/templates/usersTable.html
+++ b/modules-available/permissionmanager/templates/userstable.html