From 3e77d2067932a385bfc94f089f2cadfad145b90c Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Mon, 10 Apr 2017 11:16:56 +0100
Subject: [PATCH] update password reset for bootstrap 4
---
sourcing/templates/auth/password_reset.html | 11 +++++++++--
.../auth/password_reset_complete.html | 17 +++++------------
.../auth/password_reset_confirm.html | 11 +++++++++--
.../templates/auth/password_reset_sent.html | 19 +++++++++----------
4 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/sourcing/templates/auth/password_reset.html b/sourcing/templates/auth/password_reset.html
index 77f7b95..365c784 100644
--- a/sourcing/templates/auth/password_reset.html
+++ b/sourcing/templates/auth/password_reset.html
@@ -1,10 +1,17 @@
+{% extends "base.html" %}
+
{% from "form/controls.html" import render_field, checkbox, submit %}
-{% set title="Reset password" %}
+{% block title %}Reset password{% endblock %}
+
+{% block content %}
{% set label="send e-mail" %}
{% set fields %}
{{ render_field(form.user_or_email) }}
{% endset %}
-{% include "form/simple.html" %}
+<h1>{{ self.title() }}</h1>
+{% include "form/main.html" %}
+
+{% endblock %}
diff --git a/sourcing/templates/auth/password_reset_complete.html b/sourcing/templates/auth/password_reset_complete.html
index 697d5bc..6f76dd4 100644
--- a/sourcing/templates/auth/password_reset_complete.html
+++ b/sourcing/templates/auth/password_reset_complete.html
@@ -1,19 +1,12 @@
-{% from "form/controls.html" import render_field, checkbox, submit %}
+{% extends "base.html" %}
-{% set title="Reset password" %}
-{% set label="send e-mail" %}
+{% block title %}Reset password{% endblock %}
-{% include "head.html" %}
-
-<div class="row">
- <div class="col-md-12">
- <h1>{{ title }}</h1>
+{% block content %}
+<h1>{{ self.title() }}</h1>
<p>Your password has been set. You may go ahead and log in now.</p>
<p><a href="{{ url_for('.login') }}">Log in</a></p>
- </div>
-</div>
-
-{% include "foot.html" %}
+{% endblock %}
diff --git a/sourcing/templates/auth/password_reset_confirm.html b/sourcing/templates/auth/password_reset_confirm.html
index e7a677e..a6c97ec 100644
--- a/sourcing/templates/auth/password_reset_confirm.html
+++ b/sourcing/templates/auth/password_reset_confirm.html
@@ -1,10 +1,17 @@
+{% extends "base.html" %}
+
{% from "form/controls.html" import render_field %}
-{% set title="Reset password" %}
+{% block title %}Reset password{% endblock %}
+
+{% block content %}
{% set label="reset" %}
{% set fields %}
{{ render_field(form.password) }}
{% endset %}
-{% include "form/simple.html" %}
+<h1>{{ self.title() }}</h1>
+{% include "form/main.html" %}
+
+{% endblock %}
diff --git a/sourcing/templates/auth/password_reset_sent.html b/sourcing/templates/auth/password_reset_sent.html
index 4c556ff..f4fa503 100644
--- a/sourcing/templates/auth/password_reset_sent.html
+++ b/sourcing/templates/auth/password_reset_sent.html
@@ -1,14 +1,13 @@
-{% set title="Reset password" %}
+{% extends "base.html" %}
-{% include "head.html" %}
+{% block title %}Reset password{% endblock %}
-<div class="row">
- <div class="col-md-12">
- <h1>{{ title }}</h1>
- <p>We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly.</p>
+{% block content %}
+<h1>{{ title }}</h1>
+<p>We've emailed you instructions for setting your password, if an account
+exists with the email you entered. You should receive them shortly.</p>
- <p>If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder.</p>
- </div>
-</div>
+<p>If you don't receive an email, please make sure you've entered the address
+you registered with, and check your spam folder.</p>
-{% include "foot.html" %}
+{% endblock %}