Add 'create user' template and functionality. Fixes #39

app/templates/admin_createuser.html

@@ -0,0 +1,91 @@
+{% extends "base.html" %}
+{% block title %}<title>DNS Control Panel - Create User</title>{% endblock %}
+
+{% block dashboard_stat %}
+	<!-- Content Header (Page header) -->
+    <section class="content-header">
+      <h1>
+        User
+        <small>Create new</small>
+      </h1>
+      <ol class="breadcrumb">
+        <li><a href="{{ url_for('dashboard') }}"><i class="fa fa-dashboard"></i>Home</a></li>
+        <li><a href="{{ url_for('dashboard') }}">Admin</a></li>
+        <li class="active">Create user</li>
+      </ol>
+    </section>
+{% endblock %}
+
+{% block content %}
+<section class="content">
+<div class="row">
+	<div class="col-md-4">
+		<div class="box box-primary">
+			<div class="box-header with-border">
+				<h3 class="box-title">Create new user</h3>
+			</div>
+			<!-- /.box-header -->
+			<!-- form start -->
+			<form role="form" method="post" action="{{ url_for('admin_createuser') }}">
+				<div class="box-body">
+					<div class="form-group has-feedback">
+						<label class="control-label" for="firstname">First Name</label>
+						<input type="text" class="form-control" placeholder="First Name"
+							name="firstname" {% if user %}value={{ user.firstname }}{% endif %}> <span
+							class="glyphicon glyphicon-user form-control-feedback"></span>
+					</div>
+					<div class="form-group has-feedback">
+						<label class="control-label" for="lastname">Last Name</label>
+						<input type="text" class="form-control" placeholder="Last name"
+							name="lastname" {% if user %}value={{ user.lastname }}{% endif %}> <span
+							class="glyphicon glyphicon-user form-control-feedback"></span>
+					</div>
+					<div class="form-group has-feedback {% if duplicate_email %}has-error{% endif %}">
+						<label class="control-label" for="email">E-mail address</label>
+						<input type="email" class="form-control" placeholder="Email"
+							name="email" id="email" {% if user %}value={{ user.email }}{% endif %}> <span
+							class="glyphicon glyphicon-envelope form-control-feedback"></span>
+						{% if duplicate_email %}
+						<span class="help-block">This e-mail address is already in use.</span>
+						{% endif %}
+					</div>
+					<p class="login-box-msg">Enter the account details below</p>
+					<div class="form-group has-feedback {% if duplicate_username %}has-error{% endif %}">
+						<label class="control-label" for="username">Username</label>
+						<input type="text" class="form-control" placeholder="Username"
+							name="username" {% if user %}value={{ user.username }}{% endif %}> <span
+							class="glyphicon glyphicon-user form-control-feedback"></span>
+						{% if duplicate_username %}
+						<span class="help-block">This username is already in use.</span>
+						{% endif %}
+					</div>
+					<div class="form-group has-feedback {% if blank_password %}has-error{% endif %}">
+						<label class="control-label" for="username">Password</label>
+						<input type="password" class="form-control" placeholder="Password"
+							name="password"> <span
+							class="glyphicon glyphicon-lock form-control-feedback"></span>
+						{% if blank_password %}
+							<span class="help-block">The password cannot be blank.</span>
+						{% endif %}
+					</div>
+				</div>
+				<div class="box-footer">
+					<button type="submit" class="btn btn-flat btn-primary">Create User</button>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="col-md-8">
+		<div class="box box-primary">
+			<div class="box-header with-border">
+				<h3 class="box-title">Help with creating a new user</h3>
+			</div>
+			<div class="box-body">
+				<p>Fill in all the fields to the in the form to the left.</p>
+				<p><strong>Newly created users do not have access to any domains.</strong> You will need to grant access to the user once it is created via the domain management buttons on the dashboard.</p>
+			</div>
+		</div>
+	</div>
+</div>
+</section>
+{% endblock %}

app/templates/admin_manageuser.html

@@ -19,6 +19,13 @@
 				<div class="box-header">
 					<h3 class="box-title">User Management</h3>
 				</div>
+				<div class="box-body">
+					<a href="{{ url_for('admin_createuser') }}">
+						<button type="button" class="btn btn-flat btn-primary pull-left button_add_user">
+							Add User&nbsp;<i class="fa fa-plus"></i>
+						</button>
+					</a>
+				</div>
 				<div class="box-body">
 					<table id="tbl_users" class="table table-bordered table-striped">
 						<thead>
@@ -97,9 +104,8 @@
 		modal.find('.modal-body p').text(info);
 		modal.find('#button_delete_confirm').click(function() {
 			var postdata = {'action': 'delete_user', 'data': username}
-            applyChanges(postdata, '/admin/manageuser');
+            applyChanges(postdata, '/admin/manageuser', false, true);
 			modal.modal('hide');
-			location.reload();
 		})
 		modal.modal('show');
 		

app/views.py

@@ -373,13 +373,37 @@ def admin():
 
     return render_template('admin.html', domains=domains, users=users, configs=configs, statistics=statistics, uptime=uptime, history_number=history_number)
 
+@app.route('/admin/user/create', methods=['GET', 'POST'])
+@login_required
+@admin_role_required
+def admin_createuser():
+    if request.method == 'GET':
+        return render_template('admin_createuser.html')
+    
+    if request.method == 'POST':
+        fdata = request.form
+        
+        user = User(username=fdata['username'], plain_text_password=fdata['password'], firstname=fdata['firstname'], lastname=fdata['lastname'], email=fdata['email'])
+        
+        if fdata['password'] == "":
+            return render_template('admin_createuser.html', user=user, blank_password=True)
+        
+        result = user.create_local_user();
+        
+        if result == 'Email already existed':
+            return render_template('admin_createuser.html', user=user, duplicate_email=True)
+        
+        if result == 'Username already existed':
+            return render_template('admin_createuser.html', user=user, duplicate_username=True)
+
+        return redirect(url_for('admin_manageuser'))
 
 @app.route('/admin/manageuser', methods=['GET', 'POST'])
 @login_required
 @admin_role_required
 def admin_manageuser():
     if request.method == 'GET':
-        users = User.query.all()
+        users = User.query.order_by(User.username).all()
         return render_template('admin_manageuser.html', users=users)
 
     if request.method == 'POST':