diff --git a/itou/templates/apply/includes/list_tr.html b/itou/templates/apply/includes/list_tr.html index dfb59f68cee..905ca85d474 100644 --- a/itou/templates/apply/includes/list_tr.html +++ b/itou/templates/apply/includes/list_tr.html @@ -13,8 +13,15 @@ {% if job_applications_list_kind is JobApplicationsListKind.RECEIVED %} - - + {% if forloop.counter == 1 %} + + + + + {% else %} + + + {% endif %} {% endif %} {% if job_applications_list_kind is JobApplicationsListKind.SENT_FOR_ME %} diff --git a/itou/templates/apply/includes/siae_actions.html b/itou/templates/apply/includes/siae_actions.html index 97d92811754..95fc7a9883e 100644 --- a/itou/templates/apply/includes/siae_actions.html +++ b/itou/templates/apply/includes/siae_actions.html @@ -1,120 +1,124 @@ {% load matomo %} {% if batch_mode %} -
-

Actions rapides

-
-
- {% if can_refuse %} -
- {% csrf_token %} - {% for application_id in selected_application_ids %} - - {% endfor %} - +
+ {% else %} + - - {% else %} - - {% endif %} -
-
- {% if can_postpone %} - - {% else %} - - {% endif %} -
-
- {% if can_archive %} - - {% else %} - - {% endif %} -
- {% if request.organizations|length > 1 %} -
- {% if can_transfer %} - + {% endif %} +
+
+ {% if can_postpone %} + + {% else %} + + {% endif %} +
+
+ {% if can_archive %} + {% else %} - {% endif %}
- {% endif %} + {% if request.organizations|length > 1 %} +
+ {% if can_transfer %} + + {% else %} + + {% endif %} +
+ {% endif %} +
{% else %} -
+
+
+
{% endif %} {% if request.htmx %} {% include "apply/includes/selected_job_applications.html" with selected_nb=selected_nb request=request only %} diff --git a/itou/templates/apply/list_for_siae.html b/itou/templates/apply/list_for_siae.html index 0a39c5b0aaa..3d0f2cadacf 100644 --- a/itou/templates/apply/list_for_siae.html +++ b/itou/templates/apply/list_for_siae.html @@ -55,7 +55,6 @@ {% block modals %} {{ block.super }} {% include "apply/includes/siae_actions_modals.html" with batch_mode=False %} - {% endblock %} {% block script %} @@ -64,4 +63,67 @@ {{ filters_form.media.js }} + + {% endblock %} diff --git a/tests/www/apply/__snapshots__/test_list_for_siae.ambr b/tests/www/apply/__snapshots__/test_list_for_siae.ambr index 10079cfbd50..b94502f4afe 100644 --- a/tests/www/apply/__snapshots__/test_list_for_siae.ambr +++ b/tests/www/apply/__snapshots__/test_list_for_siae.ambr @@ -2426,17 +2426,17 @@ # name: test_list_for_siae_select_applications_batch_archive[active archive button] ''' + + Archiver + ''' # --- # name: test_list_for_siae_select_applications_batch_archive[inactive archive button] ''' + + Archiver + ''' # --- # name: test_list_for_siae_select_applications_batch_archive[modal with 1 archivable application] @@ -2518,25 +2518,25 @@ # name: test_list_for_siae_select_applications_batch_postpone[active postpone button] ''' + + Mettre en liste d’attente + ''' # --- # name: test_list_for_siae_select_applications_batch_postpone[inactive postpone button as GEIQ] ''' + + Mettre en liste d’attente + ''' # --- # name: test_list_for_siae_select_applications_batch_postpone[inactive postpone button] ''' + + Mettre en liste d’attente + ''' # --- # name: test_list_for_siae_select_applications_batch_postpone[modal with 1 postponable application] @@ -2602,62 +2602,62 @@ # name: test_list_for_siae_select_applications_batch_refuse[active refuse button] ''' + + Décliner + ''' # --- # name: test_list_for_siae_select_applications_batch_refuse[inactive refuse button as GEIQ] ''' + + Décliner + ''' # --- # name: test_list_for_siae_select_applications_batch_refuse[inactive refuse button] ''' + + Décliner + ''' # --- # name: test_list_for_siae_select_applications_batch_transfer[active transfer button] ''' ''' # --- # name: test_list_for_siae_select_applications_batch_transfer[inactive archive button] ''' + Transférer vers + ''' # --- # name: test_list_for_siae_select_applications_batch_transfer[modal with 1 transferable application] @@ -3170,8 +3170,12 @@ - - + + + + + + @@ -3247,8 +3251,10 @@ - - + + + + @@ -3321,8 +3327,10 @@ - - + + + +