From 6b16f1ba28bd56e12718b2f17998dff2a9dba295 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 3 Jan 2017 18:03:17 +0100
Subject: [PATCH] Fix account block

---
 app/templates/accounts/account_form.html           | 13 ++++++++++++-
 app/templates/accounts/account_login.html          |  9 +++++----
 app/templates/accounts/account_password_reset.html |  7 +++++--
 app/templates/accounts/account_profile.html        |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/templates/accounts/account_form.html b/app/templates/accounts/account_form.html
index a2d8b05a..88cd5475 100644
--- a/app/templates/accounts/account_form.html
+++ b/app/templates/accounts/account_form.html
@@ -1,6 +1,16 @@
+{% extends "pages/page.html" %}
 {% load i18n mezzanine_tags %}
-{% errors_for form %}
 
+{% block meta_title %}
+	{% trans "Login" %}
+{% endblock %}
+
+{% block page_title %}
+	<h1 class="dotted">{% trans "Login" %}</h1>
+{% endblock %}
+
+{% block page_content %}
+{% errors_for form %}
 <form class="form" method="post"{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
     <fieldset>
     <legend>{{ title }}</legend>
@@ -12,3 +22,4 @@
     </div>
     </fieldset>
 </form>
+{% endblock %}
diff --git a/app/templates/accounts/account_login.html b/app/templates/accounts/account_login.html
index 4fbbbaf5..70a79c0b 100644
--- a/app/templates/accounts/account_login.html
+++ b/app/templates/accounts/account_login.html
@@ -1,6 +1,5 @@
-{% extends "pages/page.html" %}
-
-{% load i18n %}
+{% extends "accounts/account_form.html" %}
+{% load i18n mezzanine_tags %}
 
 {% block meta_title %}
 	{% trans "Page not found" %}
@@ -18,10 +17,12 @@
 {% if request.user.is_authenticated %}
     <p>{% trans "You're already logged in. If you'd like to log in as a different user, you'll need to log out first." %}</p>
 {% else %}
-    {% include 'accounts/account_form.html'%}
+    {{ block.super }}
     {% url "signup" as signup_url %}
     {% url "mezzanine_password_reset" as password_reset_url %}
     {% url "profile_update" as profile_update_url %}
+	{% block message %}
     {% blocktrans %}<p>You can also <a href="{{ password_reset_url }}?next={{ profile_update_url }}">reset your password</a> if you've forgotten it.</p>{% endblocktrans %}</p>
+	{% endblock %}
 {% endif %}
 {% endblock %}
diff --git a/app/templates/accounts/account_password_reset.html b/app/templates/accounts/account_password_reset.html
index 2fe76312..d9c35a63 100644
--- a/app/templates/accounts/account_password_reset.html
+++ b/app/templates/accounts/account_password_reset.html
@@ -1,7 +1,10 @@
-{% extends "accounts/account_form.html" %}
+{% extends "accounts/account_login.html" %}
 {% load i18n %}
 
-{% block main %}
+{% block page_content %}
 {{ block.super }}
+{% endblock %}
+
+{% block message %}
 <p>{% trans "Enter your username or email address and you'll receive an email with a link you need to click, in order to log in and change your password." %}</p>
 {% endblock %}
diff --git a/app/templates/accounts/account_profile.html b/app/templates/accounts/account_profile.html
index 464a646e..d03c90ab 100644
--- a/app/templates/accounts/account_profile.html
+++ b/app/templates/accounts/account_profile.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "pages/page.html" %}
 {% load i18n mezzanine_tags accounts_tags %}
 
 {% block meta_title %}{{ profile_user|username_or:"get_full_name" }}{% endblock %}
-- 
2.39.5