[adduser] Extend module to simple user manager (add/edit/remove)

TODO: Assign roles

4 files changed, 171 insertions, 12 deletions

diff --git a/modules-available/adduser/templates/header.html b/modules-available/adduser/templates/header.html
new file mode 100644
index 00000000..34011e29
--- /dev/null
+++ b/modules-available/adduser/templates/header.html
@@ -0,0 +1,3 @@
+<div class="page-header">
+	<h1>{{lang_userManagement}}</h1>
+</div>
\ No newline at end of file
diff --git a/modules-available/adduser/templates/page-adduser.html b/modules-available/adduser/templates/page-adduser.html
index deb911c0..58d705f8 100644
--- a/modules-available/adduser/templates/page-adduser.html
+++ b/modules-available/adduser/templates/page-adduser.html
@@ -1,28 +1,39 @@
 <form class="form-adduser" action="?do=AddUser" method="post">
 	<input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="position:absolute;top:-2000px" tabindex="-1">
 	<input type="password" name="password_fake" id="password_fake" value=""  style="position:absolute;top:-2000px" tabindex="-1">
-	<h2 class="form-signin-heading">{{lang_createUser}}</h2>
+	<h2>{{lang_createUser}}</h2>
 	<div class="row">
-		<div class="col-md-4">{{lang_username}} *</div>
-		<div class="col-md-4"><input type="text" name="user" value="{{user}}" class="form-control" placeholder="{{lang_username}}" autofocus></div>
+		<div class="col-md-4"><label for="login">{{lang_login}} *</label></div>
+		<div class="col-md-4"><input id="label" type="text" name="login" value="{{login}}" class="form-control" placeholder="{{lang_username}}" autofocus></div>
 	</div>
+	<br>
 	<div class="row">
-		<div class="col-md-4">{{lang_password}} *</div>
-		<div class="col-md-4"><input type="password" name="pass1" class="form-control" placeholder="{{lang_password}}"></div>
+		<div class="col-md-4"><label for="pass1">{{lang_password}} *</label></div>
+		<div class="col-md-4"><input id="pass1" type="password" name="pass1" class="form-control" placeholder="{{lang_password}}"></div>
 		<div class="col-md-4"><input type="password" name="pass2" class="form-control" placeholder="{{lang_confirmation}}"></div>
 	</div>
+	<br>
 	<div class="row">
-		<div class="col-md-4">{{lang_fullName}} *</div>
-		<div class="col-md-4"><input type="text" name="fullname" value="{{fullname}}" class="form-control" placeholder="{{lang_fullName}}"></div>
+		<div class="col-md-4"><label for="fullname">{{lang_fullName}} *</label></div>
+		<div class="col-md-4"><input id="fullname" type="text" name="fullname" value="{{fullname}}" class="form-control" placeholder="{{lang_fullName}}"></div>
 	</div>
+	<br>
 	<div class="row">
-		<div class="col-md-4">{{lang_telephone}}</div>
-		<div class="col-md-4"><input type="text" name="phone" value="{{phone}}" class="form-control" placeholder="{{lang_telephone}}"></div>
+		<div class="col-md-4"><label for="phone">{{lang_phone}}</label></div>
+		<div class="col-md-4"><input id=phone" type="text" name="phone" value="{{phone}}" class="form-control" placeholder="{{lang_phone}}"></div>
 	</div>
+	<br>
 	<div class="row">
-		<div class="col-md-4">E-Mail</div>
-		<div class="col-md-4"><input type="text" name="email" value="{{email}}" class="form-control" placeholder="E-Mail"></div>
+		<div class="col-md-4"><label for="email">{{lang_email}}</label></div>
+		<div class="col-md-4"><input id="email" type="text" name="email" value="{{email}}" class="form-control" placeholder="{{lang_email}}"></div>
+	</div>
+	<br>
+	<div class="row">
+		<div class="col-md-4"></div>
+		<div class="col-md-8">
+			<button class="btn btn-lg btn-primary btn-block" type="submit">{{lang_createUser}}</button>
+		</div>
 	</div>
-	<button class="btn btn-lg btn-primary btn-block" type="submit">{{lang_createUser}}</button>
 	<input type="hidden" name="action" value="adduser">
+	<input type="hidden" name="token" value="{{token}}">
 </form>
diff --git a/modules-available/adduser/templates/page-edituser.html b/modules-available/adduser/templates/page-edituser.html
new file mode 100644
index 00000000..b8e51b5c
--- /dev/null
+++ b/modules-available/adduser/templates/page-edituser.html
@@ -0,0 +1,72 @@
+<form class="form-adduser" action="?do=AddUser" method="post">
+	<input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="position:absolute;top:-2000px" tabindex="-1">
+	<input type="password" name="password_fake" id="password_fake" value="" style="position:absolute;top:-2000px" tabindex="-1">
+	<h2>{{lang_editUser}}</h2>
+
+	<div class="row">
+		<div class="col-md-4"><label for="login">{{lang_login}}</label></div>
+		<div class="col-md-4"><input id="label" type="text" name="login" value="{{login}}" class="form-control"
+											  placeholder="{{lang_username}}" autofocus></div>
+	</div>
+	<div class="row">
+		<div class="col-md-4"></div>
+		<div class="col-md-8">
+			<p>
+				{{lang_changeLoginHint}}
+			</p>
+		</div>
+	</div>
+
+	<div class="row">
+		<div class="col-md-4"><label for="pass1">{{lang_changePassword}}</label></div>
+		<div class="col-md-4"><input id="pass1" {{password_disabled}} type="password" name="pass1" class="form-control" placeholder="{{lang_password}}">
+		</div>
+		<div class="col-md-4"><input {{password_disabled}} type="password" name="pass2" class="form-control"
+											  placeholder="{{lang_confirmation}}"></div>
+	</div>
+	{{#password_disabled}}
+	<div class="row">
+		<div class="col-md-4"></div>
+		<div class="col-md-8">
+			<p>
+				{{lang_changeOwnPasswordHint}}
+			</p>
+		</div>
+	</div>
+	{{/password_disabled}}
+	<br>
+
+	<div class="row">
+		<div class="col-md-4"><label for="fullname">{{lang_fullName}}</label></div>
+		<div class="col-md-4"><input id="fullname" type="text" name="fullname" value="{{fullname}}" class="form-control"
+											  placeholder="{{lang_fullName}}"></div>
+	</div>
+	<br>
+
+	<div class="row">
+		<div class="col-md-4"><label for="phone">{{lang_phone}}</label></div>
+		<div class="col-md-4"><input id=phone" type="text" name="phone" value="{{phone}}" class="form-control"
+											  placeholder="{{lang_phone}}"></div>
+	</div>
+	<br>
+
+	<div class="row">
+		<div class="col-md-4"><label for="email">{{lang_email}}</label></div>
+		<div class="col-md-4"><input id="email" type="text" name="email" value="{{email}}" class="form-control" placeholder="{{lang_email}}">
+		</div>
+	</div>
+	<br>
+
+	<div class="row">
+		<div class="col-md-4"></div>
+		<div class="col-md-8">
+			<button class="btn btn-lg btn-primary btn-block" type="submit">
+				<span class="glyphicon glyphicon-floppy-disk"></span>
+				{{lang_save}}
+			</button>
+		</div>
+	</div>
+	<input type="hidden" name="action" value="edituser">
+	<input type="hidden" name="userid" value="{{userid}}">
+	<input type="hidden" name="token" value="{{token}}">
+</form>
diff --git a/modules-available/adduser/templates/page-userlist.html b/modules-available/adduser/templates/page-userlist.html
new file mode 100644
index 00000000..5b14f7e5
--- /dev/null
+++ b/modules-available/adduser/templates/page-userlist.html
@@ -0,0 +1,73 @@
+<h2>{{lang_userlist}}</h2>
+
+{{{pagenav}}}
+
+<form method="get">
+	<input type="hidden" name="do" value="adduser">
+	<input type="hidden" name="show" value="edituser">
+	<table class="table">
+		<thead>
+		<tr>
+			<th>{{lang_login}}</th>
+			<th>{{lang_name}}</th>
+			<th>{{lang_phone}}</th>
+			<th>{{lang_email}}</th>
+			<th width="1"></th>
+		</tr>
+		</thead>
+		<tbody>
+		{{#list}}
+			<tr>
+				<td>{{login}}</td>
+				<td>{{fullname}}</td>
+				<td>{{phone}}</td>
+				<td>{{email}}</td>
+				<td class="text-nowrap">
+					<button class="btn btn-primary btn-xs" {{perms.user.edit.disabled}} type="submit" name="userid" value="{{userid}}">
+						<span class="glyphicon glyphicon-edit"></span>
+					</button>
+					{{^hide_delete}}
+					<button type="button" {{perms.user.remove.disabled}} class="btn btn-danger btn-xs"
+							  data-target="#delete-modal" data-toggle="modal" onclick="$('#delete-userid').val({{userid}})">
+						<span class="glyphicon glyphicon-trash"></span>
+					</button>
+					{{/hide_delete}}
+				</td>
+			</tr>
+		{{/list}}
+		</tbody>
+	</table>
+	<div class="text-right">
+		<a class="btn btn-success {{perms.user.add.disabled}}" href="?do=adduser&amp;show=adduser">
+			<span class="glyphicon glyphicon-plus"></span>
+			{{lang_addUser}}
+		</a>
+	</div>
+</form>
+
+<!-- Modals -->
+<div class ="modal fade" id="delete-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<form method="post">
+				<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_confirmDelete}}</h4>
+				</div>
+				<div class="modal-body">
+					<p>{{lang_roleDeleteConfirm}}</p>
+					{{lang_numAssignedUsers}}: <span id="delete-role-users"></span>
+				</div>
+				<div class="modal-footer">
+					<input type="hidden" name="action" value="deleteuser">
+					<input type="hidden" name="token" value="{{token}}">
+					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+					<button type="submit" id="delete-userid" name="userid" value="" class="btn btn-danger">
+						<span class="glyphicon glyphicon-trash"></span>
+						{{lang_delete}}
+					</button>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
\ No newline at end of file