diff --git a/apps/activity/templates/activity/activity_detail.html b/apps/activity/templates/activity/activity_detail.html index 9cfc7640..c3a40891 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 %} +

{{ title }}

{% 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 b5989378..d59a4c48 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 %} +

{{ title }}

diff --git a/apps/activity/templates/activity/activity_form.html b/apps/activity/templates/activity/activity_form.html index 6bfd4f34..c472d3cb 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 %}
diff --git a/apps/activity/templates/activity/activity_list.html b/apps/activity/templates/activity/activity_list.html index 1fadd164..3316d698 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 2e3e929c..bb99595e 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 bd44ff16..1dc43c4f 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 %}
diff --git a/apps/member/templates/member/profile_update.html b/apps/member/templates/member/profile_update.html index a50f4afd..2f018381 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 %}
diff --git a/apps/note/templates/note/conso_form.html b/apps/note/templates/note/conso_form.html index 8e9073aa..5a55248f 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 2a952e5a..70a1261f 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 f6e1f8c0..dc75ad86 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 %} +

{{ title }}

+ {# bandeau transfert/crédit/débit/activité #}
diff --git a/apps/note/templates/note/transactiontemplate_form.html b/apps/note/templates/note/transactiontemplate_form.html index e4bc42a7..ef2139e8 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 %} +

{{ title }}

{% trans "Buttons list" %}

diff --git a/apps/note/templates/note/transactiontemplate_list.html b/apps/note/templates/note/transactiontemplate_list.html index 76b116e9..fb7c2545 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 %} +

{{ title }}

{# Search field , see js #} diff --git a/apps/permission/templates/permission/all_rights.html b/apps/permission/templates/permission/all_rights.html index 82e38392..9149d326 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 29481216..fee4140d 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 %}
diff --git a/apps/treasury/templates/treasury/invoice_list.html b/apps/treasury/templates/treasury/invoice_list.html index 7dba4fa8..32c1b1c1 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 %}
diff --git a/apps/treasury/templates/treasury/remittance_list.html b/apps/treasury/templates/treasury/remittance_list.html index bf25803c..c400f18f 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 %}
diff --git a/apps/treasury/templates/treasury/sogecredit_detail.html b/apps/treasury/templates/treasury/sogecredit_detail.html index 6d304f32..994aca08 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 %}
diff --git a/apps/treasury/templates/treasury/sogecredit_list.html b/apps/treasury/templates/treasury/sogecredit_list.html index a33b1c0d..c3862811 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 %}
diff --git a/apps/treasury/templates/treasury/specialtransactionproxy_form.html b/apps/treasury/templates/treasury/specialtransactionproxy_form.html index 6cbbcd78..5d80c904 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 %}
diff --git a/apps/wei/templates/wei/base.html b/apps/wei/templates/wei/base.html index db8f2c40..dd343f8e 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 8b96e817..89d7ba85 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 %}
diff --git a/note_kfet/templates/403.html b/note_kfet/templates/403.html index 10199043..5256e32d 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 %}
diff --git a/note_kfet/templates/404.html b/note_kfet/templates/404.html index 435bb7ec..03b81658 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 %}
diff --git a/note_kfet/templates/500.html b/note_kfet/templates/500.html index ba4b5875..fb7d1c69 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 %}
diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index a784f8e6..df38eac9 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." %}
{% endif %} - {% block contenttitle %}

{{ title }}

{% endblock %}
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 b9016005..f526c0e1 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 %}
diff --git a/note_kfet/templates/registration/logged_out.html b/note_kfet/templates/registration/logged_out.html index 80dfc93e..b81c143a 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 %}
diff --git a/note_kfet/templates/registration/login.html b/note_kfet/templates/registration/login.html index 87ccbd3c..b30c9fb6 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 %} diff --git a/note_kfet/templates/registration/password_change_done.html b/note_kfet/templates/registration/password_change_done.html index 6e949134..bcc1a0fd 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 %}
diff --git a/note_kfet/templates/registration/password_change_form.html b/note_kfet/templates/registration/password_change_form.html index f594cbe1..45f7729f 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 %}
diff --git a/note_kfet/templates/registration/password_reset_complete.html b/note_kfet/templates/registration/password_reset_complete.html index 46e823f7..7e8dd743 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 %}
diff --git a/note_kfet/templates/registration/password_reset_confirm.html b/note_kfet/templates/registration/password_reset_confirm.html index c55d56b5..e52762c9 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 %}
diff --git a/note_kfet/templates/registration/password_reset_done.html b/note_kfet/templates/registration/password_reset_done.html index 56271ae0..1f22b6d6 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 %}
diff --git a/note_kfet/templates/registration/password_reset_form.html b/note_kfet/templates/registration/password_reset_form.html index 3f2d2f0f..639aefe2 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 %}
diff --git a/note_kfet/templates/registration/signup.html b/note_kfet/templates/registration/signup.html index bde985a6..268ba7ff 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 %}