diff --git a/apps/participation/migrations/0006_phase.py b/apps/participation/migrations/0006_phase.py index 3ab256e..2653caa 100644 --- a/apps/participation/migrations/0006_phase.py +++ b/apps/participation/migrations/0006_phase.py @@ -23,7 +23,7 @@ def register_phases(apps, schema_editor): ) Phase.objects.get_or_create( phase_number=4, - description="Soumission de la vidéo de synthèse de l'échange", + description="Synthèse de l'échange", ) diff --git a/apps/participation/templates/participation/phase_list.html b/apps/participation/templates/participation/phase_list.html index df11a3d..622b8fd 100644 --- a/apps/participation/templates/participation/phase_list.html +++ b/apps/participation/templates/participation/phase_list.html @@ -11,11 +11,13 @@ {% endblock %} {% block content %} - {% render_table table %} +
+ {% render_table table %} - {% trans "Update phase" as modal_title %} - {% trans "Update" as modal_button %} - {% include "base_modal.html" with modal_id="updatePhase" %} + {% trans "Update phase" as modal_title %} + {% trans "Update" as modal_button %} + {% include "base_modal.html" with modal_id="updatePhase" %} +
{% endblock %} {% block extrajavascript %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 92d89a5..65a7697 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -236,7 +236,7 @@ msgstr "vidéos" #: apps/participation/models.py:178 msgid "phase number" -msgstr "numéro de phase" +msgstr "phase" #: apps/participation/models.py:183 msgid "phase description" diff --git a/templates/base.html b/templates/base.html index 38effba..e4bd5bc 100644 --- a/templates/base.html +++ b/templates/base.html @@ -64,7 +64,11 @@ {% trans "Home" %} {% if user.is_authenticated and user.registration.participates %} {% if not user.registration.team %} @@ -208,6 +212,8 @@ +{% trans "Calendar" as modal_title %} +{% include "base_modal.html" with modal_id="calendar" modal_additional_class="modal-lg" %} {% trans "Search results" as modal_title %} {% include "base_modal.html" with modal_id="search" modal_form_method="get" modal_additional_class="modal-lg" %} {% trans "Log in" as modal_title %} @@ -230,6 +236,11 @@ $(".invalid-feedback").addClass("d-block"); $(document).ready(function () { + $('a[data-target="#calendarModal"]').click(function() { + let modalBody = $("#calendarModal div.modal-body"); + if (!modalBody.html().trim()) + modalBody.load("{% url "participation:calendar" %} #form-content") + }); $('button[data-target="#searchModal"]').click(function() { let modalBody = $("#searchModal div.modal-body"); let q = encodeURI($("#search-term").val());