Merge ~ya-bo-ng/maas:user-edit into ~deadlight/maas:vanilla

[Anthony Dillon]

Update the edit_user template.

## QA
Go to settings and edit a user
The edit user page should look good

[Anthony Dillon (ya-bo-ng)]

Also added user delete page.

[Karl Williams (deadlight)]

LGTM +1

review: Approve

diff --git a/src/maasserver/templates/maasserver/user_confirm_delete.html b/src/maasserver/templates/maasserver/user_confirm_delete.html
index 6946b48..4c94df7 100644
--- a/src/maasserver/templates/maasserver/user_confirm_delete.html
+++ b/src/maasserver/templates/maasserver/user_confirm_delete.html
@@ -5,19 +5,21 @@
 {% block page-title %}Delete user: {{ user_to_delete.user.username }}{% endblock %}
 
 {% block content %}
-<div class="eight-col">
-    <h2>Are you sure you want to delete the user "{{ user_to_delete.user.username }}"?</h2>
-</div>
-<div class="eight-col">
-    <p>This action is permanent and can not be undone.</p>
-</div>
-<div class="eight-col">
-    <form method="post">{% csrf_token %}
-        <input type="hidden" name="post" value="yes" />
-        <div class="u-float--right">
-            <a class="button--secondary button--inline" href="{% url 'settings' %}">Cancel</a>
-            <button type="submit" class="button--destructive button--inline">Delete user</button>
+<div class="p-strip">
+    <div class="row">
+        <div class="col-8">
+            <h2>Are you sure you want to delete the user "{{ user_to_delete.user.username }}"?</h2>
+            <p>This action is permanent and can not be undone.</p>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-8 u-align--right">
+            <form method="post">{% csrf_token %}
+                <input type="hidden" name="post" value="yes" />
+                <a class="p-button--neutral" href="{% url 'settings' %}">Cancel</a>
+                <button type="submit" class="p-button--negative">Delete user</button>
+            </form>
         </div>
-    </form>
+    </div>
 </div>
 {% endblock %}
diff --git a/src/maasserver/templates/maasserver/user_edit.html b/src/maasserver/templates/maasserver/user_edit.html
index 2fcf716..b9a2958 100644
--- a/src/maasserver/templates/maasserver/user_edit.html
+++ b/src/maasserver/templates/maasserver/user_edit.html
@@ -5,34 +5,42 @@
 {% block page-title %}Edit User{% endblock %}
 
 {% block content %}
-<div class="eight-col">
-    <h2>Settings</h2>
-    <div id="profile" class="eight-col u-border--bottom">
-        <form method="post" class="eight-col">
-            {% csrf_token %}
-            <ul>
-                {% for field in profile_form %} {% include "maasserver/form_field.html" %} {% endfor %}
-            </ul>
-            <input type="hidden" name="profile_submit" value="1" />
-            <div class="u-float--right">
-                <a href="{% url 'settings' %}" class="button--base button--inline">Cancel</a>
-                <button type="submit" class="button--positive button--inline">Save user</button>
+<div class="p-strip is-bordered">
+    <form method="post">
+        <div class="row">
+            <div class="col-8">
+                <h2>Settings</h2>
+                {% csrf_token %}
+                <ul class="p-list">
+                    {% for field in profile_form %} {% include "maasserver/form_field.html" %} {% endfor %}
+                </ul>
+                <input type="hidden" name="profile_submit" value="1" />
             </div>
-        </form>
-    </div>
-    <h2>Change password</h2>
-    <div id="password" class="eight-col">
-        <form method="post">
-            {% csrf_token %}
-            <ul>
-                {% for field in password_form %} {% include "maasserver/form_field.html" %} {% endfor %}
-            </ul>
-            <input type="hidden" name="password_submit" value="1" />
-            <div class="u-float--right">
-                <a href="{% url 'settings' %}"class="button--base button--inline">Cancel</a>
-                <button type="submit" class="button--positive button--inline">Save password</button>
+        </div>
+        <div class="row">
+            <div class="col-8 u-align--right">
+                <a href="{% url 'settings' %}" class="p-button--base">Cancel</a>
+                <button type="submit" class="p-button--positive">Save user</button>
             </div>
-        </form>
+        </div>
+    </form>
+</div>
+<div class="p-strip">
+    <div class="row">
+        <div class="col-8" id="password">
+            <h2>Change password</h2>
+            <form method="post">
+                {% csrf_token %}
+                <ul class="p-list">
+                    {% for field in password_form %} {% include "maasserver/form_field.html" %} {% endfor %}
+                </ul>
+                <input type="hidden" name="password_submit" value="1" />
+                <div class="u-float--right">
+                    <a href="{% url 'settings' %}"class="p-button--base">Cancel</a>
+                    <button type="submit" class="p-button--positive">Save password</button>
+                </div>
+            </form>
+        </div>
     </div>
 </div>
 {% endblock %}