diff --git a/apps/activity/templates/activity/activity_list.html b/apps/activity/templates/activity/activity_list.html index 0a1eb4de..1fadd164 100644 --- a/apps/activity/templates/activity/activity_list.html +++ b/apps/activity/templates/activity/activity_list.html @@ -8,11 +8,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block content %} {% if started_activities %} -
+

{% trans "Current activity" %}

-
+
{% for activity in started_activities %} {% include "activity/includes/activity_info.html" %} {% endfor %} diff --git a/apps/member/templates/member/base.html b/apps/member/templates/member/base.html index b474f736..650cd951 100644 --- a/apps/member/templates/member/base.html +++ b/apps/member/templates/member/base.html @@ -37,7 +37,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% elif club %} {% include "member/includes/club_info.html" %} {% endif %} - {% endblock %}
{% if user_object %} @@ -66,6 +65,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endif %}
+ {% endblock %}
{% block profile_content %}{% endblock %} diff --git a/apps/wei/templates/wei/base.html b/apps/wei/templates/wei/base.html index 24778baf..db8f2c40 100644 --- a/apps/wei/templates/wei/base.html +++ b/apps/wei/templates/wei/base.html @@ -1 +1,110 @@ -{% extends "member/base.html" %} +{% extends "base.html" %} +{% comment %} +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 %} + +{% block content %} +
+
+ {% block profile_info %} + {% if club %} +
+

+ {{ club.name }} +

+
+ + + +
+
+
+
{% trans 'name'|capfirst %}
+
{{ club.name }}
+ + {% if club.require_memberships %} +
{% trans 'date start'|capfirst %}
+
{{ club.date_start }}
+ +
{% trans 'date end'|capfirst %}
+
{{ club.date_end }}
+ +
{% trans 'year'|capfirst %}
+
{{ club.year }}
+ + {% if club.membership_fee_paid == club.membership_fee_unpaid %} +
{% trans 'membership fee'|capfirst %}
+
{{ club.membership_fee_paid|pretty_money }}
+ {% else %} + {% with bde_kfet_fee=club.parent_club.membership_fee_paid|add:club.parent_club.parent_club.membership_fee_paid %} +
{% trans 'WEI fee (paid students)'|capfirst %}
+
{{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }} +
+ {% endwith %} + + {% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %} +
{% trans 'WEI fee (unpaid students)'|capfirst %}
+
{{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }} +
+ {% endwith %} + {% endif %} + {% endif %} + + {% if "note.view_note"|has_perm:club.note %} +
{% trans 'balance'|capfirst %}
+
{{ club.note.balance | pretty_money }}
+ {% endif %} + + {% if "note.change_alias"|has_perm:club.note.alias_set.first %} +
{% trans 'aliases'|capfirst %}
+
{{ club.note.alias_set.all|join:", " }}
+ {% endif %} + +
{% trans 'email'|capfirst %}
+
{{ club.email }}
+
+
+
+ {% if True %} + {% trans "WEI list" %} + {% endif %} + {% if club.is_current_wei %} + {% if can_add_first_year_member %} + {% trans "Register 1A" %} + {% endif %} + {% if can_add_any_member %} + {% trans "Register 2A+" %} + {% endif %} + {% if "wei.change_"|has_perm:club %} + {% trans "Edit" %} + {% endif %} + {% if can_add_bus %} + {% trans "Add bus" %} + {% endif %} + {% url 'wei:wei_detail' club.pk as club_detail_url %} + {%if request.path_info != club_detail_url %} + {% trans 'View WEI' %} + {% endif %} + {% endif %} +
+
+ {% endif %} + {% endblock %} +
+
+ {% block profile_content %}{% endblock %} +
+
+{% endblock %} \ No newline at end of file diff --git a/apps/wei/templates/wei/bus_detail.html b/apps/wei/templates/wei/bus_detail.html index fc5d14a2..00c901e7 100644 --- a/apps/wei/templates/wei/bus_detail.html +++ b/apps/wei/templates/wei/bus_detail.html @@ -1,9 +1,54 @@ {% extends "wei/base.html" %} - -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} +{% load render_table from django_tables2 %} +{% load i18n %} {% block profile_content %} -{% include "wei/bus_tables.html" %} -{% endblock %} +
+
+

{{ object.name }}

+
+ +
+ {{ object.description }} +
+ +
+ {% trans "Edit" %} + {% trans "Add team" %} +
+
+ +
+ +{% if teams.data %} +
+ + {% render_table teams %} +
+ +
+{% endif %} + +{% if memberships.data %} +
+ + {% render_table memberships %} +
+ +
+ + + + +{% endif %} +{% endblock %} \ No newline at end of file diff --git a/apps/wei/templates/wei/bus_form.html b/apps/wei/templates/wei/bus_form.html index 3a2abfae..c62fec40 100644 --- a/apps/wei/templates/wei/bus_form.html +++ b/apps/wei/templates/wei/bus_form.html @@ -1,15 +1,21 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load crispy_forms_tags %} {% load i18n %} -{% block profile_info %} - {% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %} -
-{% csrf_token %} -{{ form|crispy }} - -
-{% endblock %} +
+

+ {{ title }} +

+
+
+ {% csrf_token %} + {{ form|crispy }} + +
+
+
+{% endblock %} \ No newline at end of file diff --git a/apps/wei/templates/wei/bus_tables.html b/apps/wei/templates/wei/bus_tables.html deleted file mode 100644 index 46509d8d..00000000 --- a/apps/wei/templates/wei/bus_tables.html +++ /dev/null @@ -1,50 +0,0 @@ -{% load render_table from django_tables2 %} -{% load i18n %} - -
-
-

{{ object.name }}

-
- - -
- {{ object.description }} -
- -
- {% trans "Edit" %} - {% trans "Add team" %} -
-
- -
- -{% if teams.data %} -
- - {% render_table teams %} -
- -
-{% endif %} - -{% if memberships.data %} -
- - {% render_table memberships %} -
- -
- - - - -{% endif %} diff --git a/apps/wei/templates/wei/busteam_detail.html b/apps/wei/templates/wei/busteam_detail.html index e262d64f..f77dc3c9 100644 --- a/apps/wei/templates/wei/busteam_detail.html +++ b/apps/wei/templates/wei/busteam_detail.html @@ -1,9 +1,60 @@ {% extends "wei/base.html" %} - -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} +{% load render_table from django_tables2 %} +{% load i18n %} {% block profile_content %} -{% include "wei/busteam_tables.html" %} -{% endblock %} +
+
+

{{ bus.name }}

+
+ +
+ {{ bus.description }} +
+ +
+ {% trans "Edit" %} + {% trans "Add team" %} +
+
+ +
+ +
+
+

{{ object.name }}

+
+ +
+ {{ object.description }} +
+ +
+ {% trans "Edit" %} +
+
+ +
+ +{% if memberships.data or True %} +
+ + {% render_table memberships %} +
+ +
+ + + + +{% endif %} +{% endblock %} \ No newline at end of file diff --git a/apps/wei/templates/wei/busteam_form.html b/apps/wei/templates/wei/busteam_form.html index 3a2abfae..c62fec40 100644 --- a/apps/wei/templates/wei/busteam_form.html +++ b/apps/wei/templates/wei/busteam_form.html @@ -1,15 +1,21 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load crispy_forms_tags %} {% load i18n %} -{% block profile_info %} - {% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %} -
-{% csrf_token %} -{{ form|crispy }} - -
-{% endblock %} +
+

+ {{ title }} +

+
+
+ {% csrf_token %} + {{ form|crispy }} + +
+
+
+{% endblock %} \ No newline at end of file diff --git a/apps/wei/templates/wei/busteam_tables.html b/apps/wei/templates/wei/busteam_tables.html deleted file mode 100644 index 433405b8..00000000 --- a/apps/wei/templates/wei/busteam_tables.html +++ /dev/null @@ -1,54 +0,0 @@ -{% load render_table from django_tables2 %} -{% load i18n %} - -
-
-

{{ bus.name }}

-
- - -
- {{ bus.description }} -
- -
- {% trans "Edit" %} - {% trans "Add team" %} -
-
- -
- -
-
-

{{ object.name }}

-
- - -
- {{ object.description }} -
- -
- {% trans "Edit" %} -
-
- -
- -{% if memberships.data or True %} -
- - {% render_table memberships %} -
- -
- - - - -{% endif %} diff --git a/apps/wei/templates/wei/survey.html b/apps/wei/templates/wei/survey.html index 357693fb..4bf18325 100644 --- a/apps/wei/templates/wei/survey.html +++ b/apps/wei/templates/wei/survey.html @@ -2,10 +2,6 @@ {% load i18n %} {% load crispy_forms_tags %} -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %}
diff --git a/apps/wei/templates/wei/survey_closed.html b/apps/wei/templates/wei/survey_closed.html index 719168be..e4da253d 100644 --- a/apps/wei/templates/wei/survey_closed.html +++ b/apps/wei/templates/wei/survey_closed.html @@ -2,10 +2,6 @@ {% load i18n %} {% load crispy_forms_tags %} -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %}
diff --git a/apps/wei/templates/wei/survey_end.html b/apps/wei/templates/wei/survey_end.html index a141a036..af6dace8 100644 --- a/apps/wei/templates/wei/survey_end.html +++ b/apps/wei/templates/wei/survey_end.html @@ -2,10 +2,6 @@ {% load i18n %} {% load crispy_forms_tags %} -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %}
diff --git a/apps/wei/templates/wei/weiclub_detail.html b/apps/wei/templates/wei/weiclub_detail.html index 52d918f1..40786add 100644 --- a/apps/wei/templates/wei/weiclub_detail.html +++ b/apps/wei/templates/wei/weiclub_detail.html @@ -1,30 +1,118 @@ {% extends "wei/base.html" %} - -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load render_table from django_tables2 %} +{% load i18n perms %} {% block profile_content %} -{% include "wei/weiclub_tables.html" %} +
+
+

Week-End d'Intégration

+
+
+

+ Le WEI (Week-End d’Intégration), ou 3 jours d’immersion dans les profondeurs du + monde post-préparatoire. +

+

+ Que serait une école sans son week-end d’intégration ? Quelques semaines après la + rentrée, on embarque tous et toutes à bord de bus à thèmes pour quelques jours + inoubliables dans une destination inconnue. L’objectif de ce week-end : permettre aux + nouvel·les arrivant·es de se lâcher après 2 ans de dur labeur (voire 3 pour les plus + chanceux), de découvrir l’ambiance familiale de l’ENS ainsi que de nouer des liens avec + ceux·elles qu’ils côtoieront par la suite. Dose de chants et de fun garantie ! +

+
+ {% if club.is_current_wei %} +
+ {% if not my_registration %} + {% if not not_first_year %} + + {% trans "Register to the WEI! – 1A" %} + + {% endif %} + + {% trans "Register to the WEI! – 2A+" %} + {% else %} + + {% trans "Update my registration" %} + + {% endif %} +
+ {% endif %} +
+ +{% if buses.data %} +
+
+ + {% trans "Buses" %} + +
+ {% render_table buses %} +
+{% endif %} + +{% if member_list.data %} +
+ + {% render_table member_list %} +
+{% endif %} + +{% if history_list.data %} +
+ +
+ {% render_table history_list %} +
+
+{% endif %} + +{% if pre_registrations.data %} +
+ +
+ {% render_table pre_registrations %} +
+
+{% endif %} {% endblock %} {% block extrajavascript %} - -{% endblock %} + $(document).ready(function () { + $(".no-perm").parent().addClass("d-none"); + if ($("a[data-type='validate-membership']:not(.d-none)").length === 0) { + $("a[data-type='validate-membership']").parent().addClass("d-none"); + $("#validate-membership-header").addClass("d-none"); + } + if ($("a[data-type='delete-membership']:not(.d-none)").length === 0) { + $("a[data-type='delete-membership']").parent().addClass("d-none"); + $("#delete-membership-header").addClass("d-none"); + } + }); + +{% endblock %} \ No newline at end of file diff --git a/apps/wei/templates/wei/weiclub_form.html b/apps/wei/templates/wei/weiclub_form.html index 30af2ea7..c62fec40 100644 --- a/apps/wei/templates/wei/weiclub_form.html +++ b/apps/wei/templates/wei/weiclub_form.html @@ -1,17 +1,21 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load crispy_forms_tags %} {% load i18n %} -{% block profile_info %} - {% if club %} - {% include "wei/weiclub_info.html" %} - {% endif %} -{% endblock %} - {% block profile_content %} -
- {% csrf_token %} - {{ form|crispy }} - -
-{% endblock %} +
+

+ {{ title }} +

+
+
+ {% csrf_token %} + {{ form|crispy }} + +
+
+
+{% endblock %} \ No newline at end of file diff --git a/apps/wei/templates/wei/weiclub_info.html b/apps/wei/templates/wei/weiclub_info.html deleted file mode 100644 index ef9af818..00000000 --- a/apps/wei/templates/wei/weiclub_info.html +++ /dev/null @@ -1,81 +0,0 @@ -{% load i18n static pretty_money perms %} -
-
-

{{ club.name }}

-
-
- - - -
-
-
-
{% trans 'name'|capfirst %}
-
{{ club.name }}
- - {% if club.require_memberships %} -
{% trans 'date start'|capfirst %}
-
{{ club.date_start }}
- -
{% trans 'date end'|capfirst %}
-
{{ club.date_end }}
- -
{% trans 'year'|capfirst %}
-
{{ club.year }}
- - {% if club.membership_fee_paid == club.membership_fee_unpaid %} -
{% trans 'membership fee'|capfirst %}
-
{{ club.membership_fee_paid|pretty_money }}
- {% else %} - {% with bde_kfet_fee=club.parent_club.membership_fee_paid|add:club.parent_club.parent_club.membership_fee_paid %} -
{% trans 'WEI fee (paid students)'|capfirst %}
-
{{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }} -
- {% endwith %} - - {% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %} -
{% trans 'WEI fee (unpaid students)'|capfirst %}
-
{{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }} -
- {% endwith %} - {% endif %} - {% endif %} - - {% if "note.view_note"|has_perm:club.note %} -
{% trans 'balance'|capfirst %}
-
{{ club.note.balance | pretty_money }}
- {% endif %} - - {% if "note.change_alias"|has_perm:club.note.alias_set.first %} -
{% trans 'aliases'|capfirst %}
-
{{ club.note.alias_set.all|join:", " }}
- {% endif %} - -
{% trans 'email'|capfirst %}
-
{{ club.email }}
-
-
-
- {% if True %} - {% trans "WEI list" %} - {% endif %} - {% if club.is_current_wei %} - {% if can_add_first_year_member %} - {% trans "Register 1A" %} - {% endif %} - {% if can_add_any_member %} - {% trans "Register 2A+" %} - {% endif %} - {% if "wei.change_"|has_perm:club %} - {% trans "Edit" %} - {% endif %} - {% if can_add_bus %} - {% trans "Add bus" %} - {% endif %} - {% url 'wei:wei_detail' club.pk as club_detail_url %} - {%if request.path_info != club_detail_url %} - {% trans 'View WEI' %} - {% endif %} - {% endif %} -
-
diff --git a/apps/wei/templates/wei/weiclub_tables.html b/apps/wei/templates/wei/weiclub_tables.html deleted file mode 100644 index 20887384..00000000 --- a/apps/wei/templates/wei/weiclub_tables.html +++ /dev/null @@ -1,82 +0,0 @@ -{% load render_table from django_tables2 %} -{% load i18n %} -{% load perms %} -
-
-

WEI

-
-
-

LE WEI, c'est cool !

-
- - {% if club.is_current_wei %} -
- {% if not my_registration %} - {% if not not_first_year %} - - {% endif %} - - {% else %} - - {% endif %} -
- {% endif %} -
- -
- -{% if buses.data %} -
- - {% render_table buses %} -
- -
-{% endif %} - -{% if member_list.data %} -
- - {% render_table member_list %} -
- -
-{% endif %} - -{% if history_list.data %} -
- -
- {% render_table history_list %} -
-
- -
-{% endif %} - -{% if pre_registrations.data %} -
- -
- {% render_table pre_registrations %} -
-
- -
-{% endif %} diff --git a/apps/wei/templates/wei/weimembership_form.html b/apps/wei/templates/wei/weimembership_form.html index ba4401ef..fd721f9f 100644 --- a/apps/wei/templates/wei/weimembership_form.html +++ b/apps/wei/templates/wei/weimembership_form.html @@ -4,10 +4,6 @@ {% load pretty_money %} {% load perms %} -{% block profile_info %} - {% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %}
diff --git a/apps/wei/templates/wei/weimembership_list.html b/apps/wei/templates/wei/weimembership_list.html index e0ed72fa..76643c06 100644 --- a/apps/wei/templates/wei/weimembership_list.html +++ b/apps/wei/templates/wei/weimembership_list.html @@ -2,10 +2,6 @@ {% load i18n %} {% load render_table from django_tables2 %} -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %}
diff --git a/apps/wei/templates/wei/weiregistration_confirm_delete.html b/apps/wei/templates/wei/weiregistration_confirm_delete.html index 68d9c4a3..79aff24e 100644 --- a/apps/wei/templates/wei/weiregistration_confirm_delete.html +++ b/apps/wei/templates/wei/weiregistration_confirm_delete.html @@ -2,10 +2,6 @@ {% load i18n %} {% load crispy_forms_tags %} -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %}
diff --git a/apps/wei/templates/wei/weiregistration_form.html b/apps/wei/templates/wei/weiregistration_form.html index 5bec2c0f..fae85e0f 100644 --- a/apps/wei/templates/wei/weiregistration_form.html +++ b/apps/wei/templates/wei/weiregistration_form.html @@ -1,44 +1,50 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% load crispy_forms_tags %} -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %} -
- {% csrf_token %} - {{ form|crispy }} - {{ membership_form|crispy }} - -
+
+

+ {{ title }} +

+
+
+ {% csrf_token %} + {{ form|crispy }} + {{ membership_form|crispy }} + +
+
+
{% endblock %} {% block extrajavascript %} - {% if not object.membership %} - - {% endif %} -{% endblock %} + refreshTeams(); + }); + +{% endif %} +{% endblock %} \ No newline at end of file diff --git a/apps/wei/templates/wei/weiregistration_list.html b/apps/wei/templates/wei/weiregistration_list.html index 0fa8ef0f..3e0a3295 100644 --- a/apps/wei/templates/wei/weiregistration_list.html +++ b/apps/wei/templates/wei/weiregistration_list.html @@ -2,10 +2,6 @@ {% load i18n %} {% load render_table from django_tables2 %} -{% block profile_info %} -{% include "wei/weiclub_info.html" %} -{% endblock %} - {% block profile_content %}