From fbc6570eb601039f4e04d03fdbcedb9f92763f2c Mon Sep 17 00:00:00 2001
From: Pierre-antoine Comby <comby@crans.org>
Date: Sun, 11 Aug 2019 16:21:59 +0200
Subject: [PATCH] move all templates to use base.html
---
templates/base.html | 2 +-
templates/registration/logged_out.html | 4 ++--
templates/registration/login.html | 13 +++++++++++--
templates/registration/password_change_done.html | 2 +-
templates/registration/password_change_form.html | 2 +-
templates/registration/password_reset_complete.html | 2 +-
templates/registration/password_reset_confirm.html | 2 +-
templates/registration/password_reset_done.html | 2 +-
templates/registration/password_reset_form.html | 2 +-
9 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index 12fe5548..943d443e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -55,7 +55,7 @@
</li>
{% else%}
<li class="nav-item active">
- <a class="nav-link" href="{% url 'signup' %}">
+ <a class="nav-link" href="{% url 'member:signup' %}">
<i class="fa fa-user-plus"></i> S'inscrire
</a>
</li>
diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html
index 48949e84..c0c27f47 100644
--- a/templates/registration/logged_out.html
+++ b/templates/registration/logged_out.html
@@ -1,4 +1,4 @@
-{% extends "registration/logged_out.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
@@ -13,4 +13,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block content %}
<p>{% trans "Thanks for spending some quality time with the Web site today." %}</p>
<p><a href="{% url 'index' %}">{% trans 'Log in again' %}</a></p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 8d10a1b9..73df7521 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,8 +1,17 @@
-{% extends "admin/login.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-2.0-or-later
{% endcomment %}
{% load i18n %}
-{% block title %}{% trans "Log in" %}{% endblock %}
\ No newline at end of file
+{% block title %}{% trans "Log in" %}{% endblock %}
+
+{% block content %}
+<h2>Login</h2>
+<form method="post">
+ {% csrf_token %}
+ {{ form.as_p }}
+ <button type="submit">Login</button>
+</form>
+{% endblock %}
diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html
index d42fbfd9..45edfe02 100644
--- a/templates/registration/password_change_done.html
+++ b/templates/registration/password_change_done.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_change_done.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index 07ab38c9..45edfe02 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_change_form.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html
index f0ec4b8f..055244cb 100644
--- a/templates/registration/password_reset_complete.html
+++ b/templates/registration/password_reset_complete.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_reset_complete.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index 62a761d5..edb1ae1e 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_reset_confirm.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html
index ea67e596..055244cb 100644
--- a/templates/registration/password_reset_done.html
+++ b/templates/registration/password_reset_done.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_reset_done.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
index 865d5160..055244cb 100644
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -1,4 +1,4 @@
-{% extends "registration/password_reset_form.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
--
GitLab