Merge branch 'no_content_title' into 'beta'

No content title

See merge request bde/nk20!102

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 %}

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">

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">

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 %}

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 %}

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">

apps/member/templates/member/club_members.html

@@ -1,4 +1,7 @@
 {% extends "member/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 

apps/member/templates/member/includes/club_info.html

@@ -46,8 +46,9 @@
 
     <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt>
     <dd class="col-xl-6">
-        <a class="small" href="{% url 'member:club_alias' club.pk %}">
+        <a class="badge badge-secondary" href="{% url 'member:club_alias' club.pk %}">
-            {% trans 'Edit aliases' %} ({{ club.note.alias_set.all|length }})
+            <i class="fa fa-edit"></i>
+            {% trans 'Manage aliases' %} ({{ user_object.note.alias_set.all|length }})
         </a>
     </dd>
 

apps/member/templates/member/includes/profile_info.html

@@ -10,7 +10,8 @@
     {% if user_object.pk == user.pk %}
     <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
     <dd class="col-xl-6">
-        <a class="small" href="{% url 'password_change' %}">
+        <a class="badge badge-secondary" href="{% url 'password_change' %}">
+            <i class="fa fa-lock"></i>
             {% trans 'Change password' %}
         </a>
     </dd>
@@ -18,8 +19,9 @@
 
     <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt>
     <dd class="col-xl-6">
-        <a class="small" href="{% url 'member:user_alias' user_object.pk %}">
+        <a class="badge badge-secondary" href="{% url 'member:user_alias' user_object.pk %}">
-            {% trans 'Edit aliases' %} ({{ user_object.note.alias_set.all|length }})
+            <i class="fa fa-edit"></i>
+            {% trans 'Manage aliases' %} ({{ user_object.note.alias_set.all|length }})
         </a>
     </dd>
 

apps/member/templates/member/picture_update.html

@@ -1,4 +1,7 @@
 {% extends "member/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n crispy_forms_tags %}
 
 {% block profile_content %}

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">

apps/note/templates/note/amount_input.html

@@ -1,3 +1,7 @@
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+
 {# Select amount to transfert in € #}
 <div class="input-group">
     <input class="form-control mx-auto d-block" type="number" {% if not widget.attrs.negative %}min="0"{% endif %} step="0.01"

apps/note/templates/note/conso_form.html

@@ -1,10 +1,9 @@
 {% extends "base.html" %}
-
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n static pretty_money django_tables2 %}
 
-{# Remove page title #}
-{% block contenttitle %}{% endblock %}
-
 {# Use a fluid-width container #}
 {% block containertype %}container-fluid{% endblock %}
 

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 %}

apps/note/templates/note/transaction_form.html

@@ -2,10 +2,11 @@
 {% comment %}
 SPDX-License-Identifier: GPL-2.0-or-later
 {% endcomment %}
-
 {% 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">

apps/note/templates/note/transactiontemplate_form.html

@@ -1,11 +1,11 @@
 {% extends "base.html" %}
-
+{% comment %}
-{% load static %}
+SPDX-License-Identifier: GPL-3.0-or-later
-{% load i18n %}
+{% endcomment %}
-{% load crispy_forms_tags %}
+{% load static i18n crispy_forms_tags pretty_money %}
-{% 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>

apps/note/templates/note/transactiontemplate_list.html

@@ -1,8 +1,12 @@
 {% extends "base.html" %}
-{% load pretty_money %}
+{% comment %}
-{% load i18n %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load pretty_money 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 #}

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 %}

apps/registration/templates/registration/email_validation_complete.html

@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 
 {% block content %}

apps/registration/templates/registration/email_validation_email_sent.html

@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 
 {% block content %}

apps/registration/templates/registration/future_profile_detail.html

@@ -1,8 +1,8 @@
 {% extends "base.html" %}
-{% load static %}
+{% comment %}
-{% load i18n %}
+SPDX-License-Identifier: GPL-3.0-or-later
-{% load crispy_forms_tags %}
+{% endcomment %}
-{% load perms %}
+{% load i18n crispy_forms_tags perms %}
 
 {% block content %}
     <div class="row mt-4">

apps/registration/templates/registration/future_user_list.html

@@ -2,8 +2,6 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
-{% load render_table from django_tables2 %}
-{% load crispy_forms_tags %}
 {% load i18n %}
 
 {% block content %}

apps/treasury/templates/treasury/invoice_confirm_delete.html

@@ -1,6 +1,8 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% comment %}
-{% load crispy_forms_tags %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
 
 {% block content %}
     <div class="card bg-light">

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">

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">

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">

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">

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">

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">

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 %}

apps/wei/templates/wei/bus_detail.html

@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
 

apps/wei/templates/wei/busteam_detail.html

@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
 

apps/wei/templates/wei/survey.html

@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 

apps/wei/templates/wei/survey_closed.html

@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 

apps/wei/templates/wei/survey_end.html

@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 

apps/wei/templates/wei/weiclub_list.html

@@ -1,6 +1,10 @@
 {% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
+
 {% block content %}
 <div class="row justify-content-center mb-4">
     <div class="col-md-10 text-center">

apps/wei/templates/wei/weimembership_form.html

@@ -1,8 +1,8 @@
 {% extends "wei/base.html" %}
-{% load crispy_forms_tags %}
+{% comment %}
-{% load i18n %}
+SPDX-License-Identifier: GPL-3.0-or-later
-{% load pretty_money %}
+{% endcomment %}
-{% load perms %}
+{% load i18n crispy_forms_tags pretty_money perms %}
 
 {% block profile_content %}
     <div class="card bg-light shadow">

apps/wei/templates/wei/weimembership_list.html

@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 

apps/wei/templates/wei/weiregistration_confirm_delete.html

@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 

apps/wei/templates/wei/weiregistration_list.html

@@ -1,4 +1,7 @@
 {% extends "wei/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 

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">

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">

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">

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">

note_kfet/templates/autocomplete_model.html

@@ -1,4 +1,7 @@
 {% load i18n %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 
 <input type="hidden" name="{{ widget.name }}" {% if widget.attrs.model_pk %}value="{{ widget.attrs.model_pk }}"{% endif %} id="{{ widget.attrs.id }}_pk">
 <input type="text"

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

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">

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">

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" %}">

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">

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">

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">

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">

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">

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">

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">