From d9e003a8f43a27cf8a0335b57c3f48165733ecaa Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Tue, 1 Sep 2020 10:13:05 +0200
Subject: [PATCH] Remove contenttitle

---
 apps/activity/templates/activity/activity_detail.html          | 1 +
 apps/activity/templates/activity/activity_entry.html           | 1 +
 apps/activity/templates/activity/activity_form.html            | 1 -
 apps/activity/templates/activity/activity_list.html            | 1 -
 apps/member/templates/member/base.html                         | 1 -
 apps/member/templates/member/club_form.html                    | 1 -
 apps/member/templates/member/profile_update.html               | 1 -
 apps/note/templates/note/conso_form.html                       | 3 ---
 apps/note/templates/note/search_transactions.html              | 1 -
 apps/note/templates/note/transaction_form.html                 | 2 ++
 apps/note/templates/note/transactiontemplate_form.html         | 1 +
 apps/note/templates/note/transactiontemplate_list.html         | 1 +
 apps/permission/templates/permission/all_rights.html           | 1 -
 apps/treasury/templates/treasury/invoice_form.html             | 1 -
 apps/treasury/templates/treasury/invoice_list.html             | 1 -
 apps/treasury/templates/treasury/remittance_list.html          | 1 -
 apps/treasury/templates/treasury/sogecredit_detail.html        | 1 -
 apps/treasury/templates/treasury/sogecredit_list.html          | 1 -
 .../templates/treasury/specialtransactionproxy_form.html       | 1 -
 apps/wei/templates/wei/base.html                               | 1 -
 note_kfet/templates/400.html                                   | 1 -
 note_kfet/templates/403.html                                   | 1 -
 note_kfet/templates/404.html                                   | 1 -
 note_kfet/templates/500.html                                   | 1 -
 note_kfet/templates/base.html                                  | 1 -
 note_kfet/templates/base_search.html                           | 1 -
 note_kfet/templates/registration/logged_out.html               | 1 -
 note_kfet/templates/registration/login.html                    | 1 -
 note_kfet/templates/registration/password_change_done.html     | 1 -
 note_kfet/templates/registration/password_change_form.html     | 1 -
 note_kfet/templates/registration/password_reset_complete.html  | 1 -
 note_kfet/templates/registration/password_reset_confirm.html   | 1 -
 note_kfet/templates/registration/password_reset_done.html      | 1 -
 note_kfet/templates/registration/password_reset_form.html      | 1 -
 note_kfet/templates/registration/signup.html                   | 1 -
 35 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/apps/activity/templates/activity/activity_detail.html b/apps/activity/templates/activity/activity_detail.html
index 9cfc764..c3a4089 100644
--- a/apps/activity/templates/activity/activity_detail.html
+++ b/apps/activity/templates/activity/activity_detail.html
@@ -6,6 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% load render_table from django_tables2 %}
 
 {% block content %}
+<h1 class="text-white">{{ title }}</h1>
 {% include "activity/includes/activity_info.html" %}
 
 {% if guests.data %}
diff --git a/apps/activity/templates/activity/activity_entry.html b/apps/activity/templates/activity/activity_entry.html
index b598937..d59a4c4 100644
--- a/apps/activity/templates/activity/activity_entry.html
+++ b/apps/activity/templates/activity/activity_entry.html
@@ -6,6 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% load render_table from django_tables2 %}
 
 {% block content %}
+<h1 class="text-white">{{ title }}</h1>
 <div class="row">
     <div class="col-xl-12">
         <div class="btn-group btn-group-toggle bg-light" style="width: 100%" data-toggle="buttons">
diff --git a/apps/activity/templates/activity/activity_form.html b/apps/activity/templates/activity/activity_form.html
index 6bfd4f3..c472d3c 100644
--- a/apps/activity/templates/activity/activity_form.html
+++ b/apps/activity/templates/activity/activity_form.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-white mb-3">
diff --git a/apps/activity/templates/activity/activity_list.html b/apps/activity/templates/activity/activity_list.html
index 1fadd16..3316d69 100644
--- a/apps/activity/templates/activity/activity_list.html
+++ b/apps/activity/templates/activity/activity_list.html
@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 {% if started_activities %}
diff --git a/apps/member/templates/member/base.html b/apps/member/templates/member/base.html
index 2e3e929..bb99595 100644
--- a/apps/member/templates/member/base.html
+++ b/apps/member/templates/member/base.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n perms %}
-{% block contenttitle %}{% endblock %}
 
 {# Use a fluid-width container #}
 {% block containertype %}container-fluid{% endblock %}
diff --git a/apps/member/templates/member/club_form.html b/apps/member/templates/member/club_form.html
index bd44ff1..1dc43c4 100644
--- a/apps/member/templates/member/club_form.html
+++ b/apps/member/templates/member/club_form.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {% block profile_content %}
 <div class="card bg-light">
diff --git a/apps/member/templates/member/profile_update.html b/apps/member/templates/member/profile_update.html
index a50f4af..2f01838 100644
--- a/apps/member/templates/member/profile_update.html
+++ b/apps/member/templates/member/profile_update.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {% block profile_content %}
 <div class="card bg-light">
diff --git a/apps/note/templates/note/conso_form.html b/apps/note/templates/note/conso_form.html
index 8e9073a..5a55248 100644
--- a/apps/note/templates/note/conso_form.html
+++ b/apps/note/templates/note/conso_form.html
@@ -2,9 +2,6 @@
 
 {% load i18n static pretty_money django_tables2 %}
 
-{# Remove page title #}
-{% block contenttitle %}{% endblock %}
-
 {# Use a fluid-width container #}
 {% block containertype %}container-fluid{% endblock %}
 
diff --git a/apps/note/templates/note/search_transactions.html b/apps/note/templates/note/search_transactions.html
index 2a952e5..70a1261 100644
--- a/apps/note/templates/note/search_transactions.html
+++ b/apps/note/templates/note/search_transactions.html
@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load render_table from django_tables2 %}
 {% load crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {# Use a fluid-width container #}
 {% block containertype %}container-fluid{% endblock %}
diff --git a/apps/note/templates/note/transaction_form.html b/apps/note/templates/note/transaction_form.html
index f6e1f8c..dc75ad8 100644
--- a/apps/note/templates/note/transaction_form.html
+++ b/apps/note/templates/note/transaction_form.html
@@ -6,6 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
 {% load i18n static django_tables2 perms %}
 
 {% block content %}
+<h1 class="text-white">{{ title }}</h1>
+
 {# bandeau transfert/crédit/débit/activité #}
     <div class="row">
         <div class="col-xl-12">
diff --git a/apps/note/templates/note/transactiontemplate_form.html b/apps/note/templates/note/transactiontemplate_form.html
index e4bc42a..ef2139e 100644
--- a/apps/note/templates/note/transactiontemplate_form.html
+++ b/apps/note/templates/note/transactiontemplate_form.html
@@ -6,6 +6,7 @@
 {% load pretty_money %}
 
 {% block content %}
+<h1 class="text-white">{{ title }}</h1>
     <p>
         <a class="btn btn-default" href="{% url 'note:template_list' %}">{% trans "Buttons list" %}</a>
     </p>
diff --git a/apps/note/templates/note/transactiontemplate_list.html b/apps/note/templates/note/transactiontemplate_list.html
index 76b116e..fb7c254 100644
--- a/apps/note/templates/note/transactiontemplate_list.html
+++ b/apps/note/templates/note/transactiontemplate_list.html
@@ -3,6 +3,7 @@
 {% load i18n %}
 {% load render_table from django_tables2 %}
 {% block content %}
+<h1 class="text-white">{{ title }}</h1>
 <div class="row justify-content-center mb-4">
     <div class="col-md-10 text-center">
         {# Search field , see js #}
diff --git a/apps/permission/templates/permission/all_rights.html b/apps/permission/templates/permission/all_rights.html
index 82e3839..9149d32 100644
--- a/apps/permission/templates/permission/all_rights.html
+++ b/apps/permission/templates/permission/all_rights.html
@@ -4,7 +4,6 @@
 {% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
     {% if user.is_authenticated %}
diff --git a/apps/treasury/templates/treasury/invoice_form.html b/apps/treasury/templates/treasury/invoice_form.html
index 2948121..fee4140 100644
--- a/apps/treasury/templates/treasury/invoice_form.html
+++ b/apps/treasury/templates/treasury/invoice_form.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-white mb-3">
diff --git a/apps/treasury/templates/treasury/invoice_list.html b/apps/treasury/templates/treasury/invoice_list.html
index 7dba4fa..32c1b1c 100644
--- a/apps/treasury/templates/treasury/invoice_list.html
+++ b/apps/treasury/templates/treasury/invoice_list.html
@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="row">
diff --git a/apps/treasury/templates/treasury/remittance_list.html b/apps/treasury/templates/treasury/remittance_list.html
index bf25803..c400f18 100644
--- a/apps/treasury/templates/treasury/remittance_list.html
+++ b/apps/treasury/templates/treasury/remittance_list.html
@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="row">
diff --git a/apps/treasury/templates/treasury/sogecredit_detail.html b/apps/treasury/templates/treasury/sogecredit_detail.html
index 6d304f3..994aca0 100644
--- a/apps/treasury/templates/treasury/sogecredit_detail.html
+++ b/apps/treasury/templates/treasury/sogecredit_detail.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n pretty_money perms %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/apps/treasury/templates/treasury/sogecredit_list.html b/apps/treasury/templates/treasury/sogecredit_list.html
index a33b1c0..c386281 100644
--- a/apps/treasury/templates/treasury/sogecredit_list.html
+++ b/apps/treasury/templates/treasury/sogecredit_list.html
@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="row">
diff --git a/apps/treasury/templates/treasury/specialtransactionproxy_form.html b/apps/treasury/templates/treasury/specialtransactionproxy_form.html
index 6cbbcd7..5d80c90 100644
--- a/apps/treasury/templates/treasury/specialtransactionproxy_form.html
+++ b/apps/treasury/templates/treasury/specialtransactionproxy_form.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-white mb-3">
diff --git a/apps/wei/templates/wei/base.html b/apps/wei/templates/wei/base.html
index db8f2c4..dd343f8 100644
--- a/apps/wei/templates/wei/base.html
+++ b/apps/wei/templates/wei/base.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n pretty_money perms %}
-{% block contenttitle %}{% endblock %}
 
 {# Use a fluid-width container #}
 {% block containertype %}container-fluid{% endblock %}
diff --git a/note_kfet/templates/400.html b/note_kfet/templates/400.html
index 8b96e81..89d7ba8 100644
--- a/note_kfet/templates/400.html
+++ b/note_kfet/templates/400.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card text-white bg-secondary">
diff --git a/note_kfet/templates/403.html b/note_kfet/templates/403.html
index 1019904..5256e32 100644
--- a/note_kfet/templates/403.html
+++ b/note_kfet/templates/403.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card text-white bg-secondary">
diff --git a/note_kfet/templates/404.html b/note_kfet/templates/404.html
index 435bb7e..03b8165 100644
--- a/note_kfet/templates/404.html
+++ b/note_kfet/templates/404.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card text-white bg-secondary">
diff --git a/note_kfet/templates/500.html b/note_kfet/templates/500.html
index ba4b587..fb7d1c6 100644
--- a/note_kfet/templates/500.html
+++ b/note_kfet/templates/500.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card text-white bg-secondary">
diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html
index a784f8e..df38eac 100644
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@@ -163,7 +163,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 {% trans "Your e-mail address is not validated. Please check your mail inbox and click on the validation link." %}
             </div>
         {% endif %}
-        {% block contenttitle %}<h1 class="text-white">{{ title }}</h1>{% endblock %}
         <div class="alert alert-warning alert-dismissible">
             <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&#215;</button>
             Attention : la Note Kfet 2020 est en phase de beta. Des fonctionnalités pourront être rajoutées d'ici à la version
diff --git a/note_kfet/templates/base_search.html b/note_kfet/templates/base_search.html
index b901600..f526c0e 100644
--- a/note_kfet/templates/base_search.html
+++ b/note_kfet/templates/base_search.html
@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n perms %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/note_kfet/templates/registration/logged_out.html b/note_kfet/templates/registration/logged_out.html
index 80dfc93..b81c143 100644
--- a/note_kfet/templates/registration/logged_out.html
+++ b/note_kfet/templates/registration/logged_out.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/note_kfet/templates/registration/login.html b/note_kfet/templates/registration/login.html
index 87ccbd3..b30c9fb 100644
--- a/note_kfet/templates/registration/login.html
+++ b/note_kfet/templates/registration/login.html
@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags static %}
 {% block title %}{% trans "Log in" %}{% endblock %}
-{% block contenttitle %}{% endblock %}
 
 {% block extracss %}
 <link rel="stylesheet" href="{% static "registration/css/login.css" %}">
diff --git a/note_kfet/templates/registration/password_change_done.html b/note_kfet/templates/registration/password_change_done.html
index 6e94913..bcc1a0f 100644
--- a/note_kfet/templates/registration/password_change_done.html
+++ b/note_kfet/templates/registration/password_change_done.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/note_kfet/templates/registration/password_change_form.html b/note_kfet/templates/registration/password_change_form.html
index f594cbe..45f7729 100644
--- a/note_kfet/templates/registration/password_change_form.html
+++ b/note_kfet/templates/registration/password_change_form.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/note_kfet/templates/registration/password_reset_complete.html b/note_kfet/templates/registration/password_reset_complete.html
index 46e823f..7e8dd74 100644
--- a/note_kfet/templates/registration/password_reset_complete.html
+++ b/note_kfet/templates/registration/password_reset_complete.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/note_kfet/templates/registration/password_reset_confirm.html b/note_kfet/templates/registration/password_reset_confirm.html
index c55d56b..e52762c 100644
--- a/note_kfet/templates/registration/password_reset_confirm.html
+++ b/note_kfet/templates/registration/password_reset_confirm.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/note_kfet/templates/registration/password_reset_done.html b/note_kfet/templates/registration/password_reset_done.html
index 56271ae..1f22b6d 100644
--- a/note_kfet/templates/registration/password_reset_done.html
+++ b/note_kfet/templates/registration/password_reset_done.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/note_kfet/templates/registration/password_reset_form.html b/note_kfet/templates/registration/password_reset_form.html
index 3f2d2f0..639aefe 100644
--- a/note_kfet/templates/registration/password_reset_form.html
+++ b/note_kfet/templates/registration/password_reset_form.html
@@ -3,7 +3,6 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">
diff --git a/note_kfet/templates/registration/signup.html b/note_kfet/templates/registration/signup.html
index bde985a..268ba7f 100644
--- a/note_kfet/templates/registration/signup.html
+++ b/note_kfet/templates/registration/signup.html
@@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
 {% block title %}{% trans "Sign up" %}{% endblock %}
-{% block contenttitle %}{% endblock %}
 
 {% block content %}
 <div class="card bg-light">