2 files changed, 28 insertions, 16 deletions
diff --git a/ishtar_common/templates/registration/password_change_done.html b/ishtar_common/templates/registration/password_change_done.html
deleted file mode 100644
index 9d442360c..000000000
--- a/ishtar_common/templates/registration/password_change_done.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
-<div class='info'>
-<p>{% trans "Password changed" %}</p>
-</div>
-{% endblock %}
diff --git a/ishtar_common/templates/registration/password_change_form.html b/ishtar_common/templates/registration/password_change_form.html
index 84d915eaa..deb7af503 100644
--- a/ishtar_common/templates/registration/password_change_form.html
+++ b/ishtar_common/templates/registration/password_change_form.html
@@ -2,13 +2,33 @@
 {% load i18n %}
 
 {% block content %}
-<div class='form'>
-<form method="post" action=".">{% csrf_token %}
-  <table>
-  {{ form.as_table }}
+<div class="container">
+  <div class="row justify-content-center">
+    <div class="col-lg-4 col-md-6 col-sm-10">
+      <h3 class="text-center">{% trans "Change password" %}</h3>
+      <form method="post" action=".">{% csrf_token %}
+        {% if form.non_field_errors %}
+        <div class="form-group row">
+          {% for error in form.non_field_errors %}
+          <div class="form-group has-errors text-danger small">
+            {{error}}
+          </div>
+          {% endfor %}
+        </div>
+        {% endif %}
+        {% with force_large_col=True %}
+        {% for field in form %}
+        {% include "blocks/bs_field_snippet.html" %}
+        {% endfor %}
+        {% endwith %}
 
-  <tr><td colspan='2'><input type="submit" value="{% trans 'Submit' %}" /></td></tr>
-  </table>
-</form>
-</p>
+        <div class="row justify-content-center">
+          <div class="col-4">
+            <button type="submit" class="btn btn-primary">{% trans 'Validate' %}</button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
 {% endblock %}