diff --git a/itou/templates/apply/process_base.html b/itou/templates/apply/process_base.html index 9ddfeb2b70..65d043963b 100644 --- a/itou/templates/apply/process_base.html +++ b/itou/templates/apply/process_base.html @@ -6,7 +6,7 @@ {% block title_content %}
-

+

Candidature de {% if with_job_seeker_detail_url|default:False %} {{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }} diff --git a/itou/templates/apply/submit/application/base.html b/itou/templates/apply/submit/application/base.html index c944733f48..8aa9a4cbed 100644 --- a/itou/templates/apply/submit/application/base.html +++ b/itou/templates/apply/submit/application/base.html @@ -31,7 +31,7 @@ {% block title_content %} {% if not job_app_to_transfer|default:False %}
-

{% include 'apply/includes/_submit_title.html' %}

+

{% include 'apply/includes/_submit_title.html' %}

{% include 'apply/includes/eligibility_badge.html' %}

diff --git a/itou/templates/approvals/declare_prolongation.html b/itou/templates/approvals/declare_prolongation.html index 6db3db48b0..7300e7df0f 100644 --- a/itou/templates/approvals/declare_prolongation.html +++ b/itou/templates/approvals/declare_prolongation.html @@ -5,11 +5,7 @@ {% block title %}Déclarer une prolongation de PASS IAE {{ block.super }}{% endblock %} {% block title_content %} -

- Déclarer une prolongation de PASS IAE -
- {{ approval.user.get_full_name }} -

+

Déclarer une prolongation de PASS IAE pour {{ approval.user.get_full_name }}

{% endblock %} {% block content %} diff --git a/itou/templates/approvals/prolongation_requests/show.html b/itou/templates/approvals/prolongation_requests/show.html index 2b0f4631cf..665772e94c 100644 --- a/itou/templates/approvals/prolongation_requests/show.html +++ b/itou/templates/approvals/prolongation_requests/show.html @@ -13,7 +13,7 @@ {% block title_content %}
-

+

Demande de prolongation pour {{ prolongation_request.approval.user.get_full_name }}

{% include "approvals/prolongation_requests/_status_badge.html" with badge_size="badge-base" %} diff --git a/itou/templates/approvals/suspend.html b/itou/templates/approvals/suspend.html index 479f4fcf2c..190190c22f 100644 --- a/itou/templates/approvals/suspend.html +++ b/itou/templates/approvals/suspend.html @@ -6,11 +6,7 @@ {% block title %}Déclarer une suspension de PASS IAE {{ block.super }}{% endblock %} {% block title_content %} -

- Déclarer une suspension de PASS IAE -
- {{ approval.user.get_full_name }} -

+

Déclarer une suspension de PASS IAE pour {{ approval.user.get_full_name }}

{% endblock %} {% block content %} diff --git a/itou/templates/approvals/suspension_action_choice.html b/itou/templates/approvals/suspension_action_choice.html index 650adb18a0..fe4338afe6 100644 --- a/itou/templates/approvals/suspension_action_choice.html +++ b/itou/templates/approvals/suspension_action_choice.html @@ -5,11 +5,7 @@ {% block title %}Supprimer la suspension du PASS IAE {{ block.super }}{% endblock %} {% block title_content %} -

- Supprimer la suspension du PASS IAE de -
- {{ suspension.approval.user.get_full_name }} -

+

Supprimer la suspension du PASS IAE de {{ suspension.approval.user.get_full_name }}

{% endblock %} {% block content %} diff --git a/itou/templates/approvals/suspension_delete.html b/itou/templates/approvals/suspension_delete.html index ec64bf4464..fcebe02afa 100644 --- a/itou/templates/approvals/suspension_delete.html +++ b/itou/templates/approvals/suspension_delete.html @@ -6,11 +6,7 @@ {% block title %}Supprimer la suspension du PASS IAE {{ block.super }}{% endblock %} {% block title_content %} -

- Supprimer la suspension du PASS IAE de -
- {{ suspension.approval.user.get_full_name }} -

+

Supprimer la suspension du PASS IAE de {{ suspension.approval.user.get_full_name }}

{% endblock %} {% block content %} diff --git a/itou/templates/approvals/suspension_update.html b/itou/templates/approvals/suspension_update.html index 50e2dce775..931a4ea61e 100644 --- a/itou/templates/approvals/suspension_update.html +++ b/itou/templates/approvals/suspension_update.html @@ -5,11 +5,7 @@ {% block title %}Modifier la suspension de PASS IAE {{ block.super }}{% endblock %} {% block title_content %} -

- Modifier la suspension de PASS IAE -
- {{ suspension.approval.user.get_full_name }} -

+

Modifier la suspension de PASS IAE de {{ suspension.approval.user.get_full_name }}

{% endblock %} {% block content %} diff --git a/itou/templates/approvals/suspension_update_enddate.html b/itou/templates/approvals/suspension_update_enddate.html index fd50662a20..c458ea2101 100644 --- a/itou/templates/approvals/suspension_update_enddate.html +++ b/itou/templates/approvals/suspension_update_enddate.html @@ -5,11 +5,7 @@ {% block title %}Supprimer la suspension du PASS IAE {{ block.super }}{% endblock %} {% block title_content %} -

- Supprimer la suspension du PASS IAE de -
- {{ suspension.approval.user.get_full_name }} -

+

Supprimer la suspension du PASS IAE de {{ suspension.approval.user.get_full_name }}

{% endblock %} {% block content %} diff --git a/itou/templates/companies/job_description_card.html b/itou/templates/companies/job_description_card.html index f5727c9f5d..328b970c33 100644 --- a/itou/templates/companies/job_description_card.html +++ b/itou/templates/companies/job_description_card.html @@ -26,15 +26,13 @@ {% include "apply/includes/job_application_external_transfer_progress.html" with job_app_to_transfer=job_app_to_transfer step=1 only %} {% endif %} -
-
-

{{ job.display_name }}

+
+
+

{{ job.display_name }}

{% if job.is_active %} -

- - {{ job.open_positions }} {{ job.open_positions|pluralizefr:"poste ouvert,postes ouverts" }} au recrutement - -

+ + {{ job.open_positions }} {{ job.open_positions|pluralizefr:"poste ouvert,postes ouverts" }} au recrutement + {% endif %}
{% if can_update_job_description %} diff --git a/itou/templates/dashboard/edit_job_seeker_info.html b/itou/templates/dashboard/edit_job_seeker_info.html index 2d131734b4..b43f3f693b 100644 --- a/itou/templates/dashboard/edit_job_seeker_info.html +++ b/itou/templates/dashboard/edit_job_seeker_info.html @@ -16,11 +16,7 @@
{% endblock %} -{% block title_content %} -

- Informations personnelles de {{ job_seeker.get_full_name }} -

-{% endblock %} +{% block title_content %}

Informations personnelles de {{ job_seeker.get_full_name }}

{% endblock %} {% block content %}
diff --git a/itou/templates/employee_record/summary.html b/itou/templates/employee_record/summary.html index 577b03e7e2..ebaa26ad18 100644 --- a/itou/templates/employee_record/summary.html +++ b/itou/templates/employee_record/summary.html @@ -3,17 +3,19 @@ {% load format_filters %} {% load django_bootstrap5 %} -{% block title %} - Détail fiche salarié ASP - {{ request.current_organization.display_name }} {{ block.super }} -{% endblock %} +{% block title %}Fiche salarié ASP - {{ request.current_organization.display_name }} {{ block.super }}{% endblock %} {% block title_prevstep %} {% include "layout/previous_step.html" with back_url=back_url only %} {% endblock %} {% block title_content %} -

Détail fiche salarié ASP: {{ employee_record.job_application.job_seeker.get_full_name }}

-

{% include 'employee_record/includes/_status.html' with employee_record=employee_record only %}

+
+

+ Fiche salarié ASP : {{ employee_record.job_application.job_seeker.get_full_name }} +

+ {% include 'employee_record/includes/_status.html' with employee_record=employee_record only %} +
{% endblock %} {% block content %} diff --git a/itou/templates/geiq/assessment_info_for_employer.html b/itou/templates/geiq/assessment_info_for_employer.html index 35775b9652..f062ea8feb 100644 --- a/itou/templates/geiq/assessment_info_for_employer.html +++ b/itou/templates/geiq/assessment_info_for_employer.html @@ -10,7 +10,7 @@ {% block title_content %}
-

Bilan d’exécution - {{ assessment.campaign.year }}

+

Bilan d’exécution - {{ assessment.campaign.year }}

{% if not assessment.submitted_at %} En attente du bilan d’exécution {% elif not assessment.reviewed_at %} diff --git a/itou/templates/geiq/assessment_info_for_labor_inspector.html b/itou/templates/geiq/assessment_info_for_labor_inspector.html index 3ccd541679..8feba4ebc5 100644 --- a/itou/templates/geiq/assessment_info_for_labor_inspector.html +++ b/itou/templates/geiq/assessment_info_for_labor_inspector.html @@ -10,7 +10,7 @@ {% block title_content %}
-

Bilan d’exécution - {{ assessment.campaign.year }}

+

Bilan d’exécution - {{ assessment.campaign.year }}

{% include "geiq/includes/labor_inspector_assessment_state_badge.html" with assessment=assessment extra_class="" ReviewState=ReviewState only %}
diff --git a/itou/templates/geiq/assessment_review.html b/itou/templates/geiq/assessment_review.html index 24405d44ad..08ebd0b53e 100644 --- a/itou/templates/geiq/assessment_review.html +++ b/itou/templates/geiq/assessment_review.html @@ -11,7 +11,7 @@ {% block title_content %}
-

Valider le bilan d’exécution - {{ assessment.campaign.year }}

+

Valider le bilan d’exécution - {{ assessment.campaign.year }}

{% include "geiq/includes/labor_inspector_assessment_state_badge.html" with assessment=assessment extra_class="" ReviewState=ReviewState only %}
diff --git a/itou/templates/job_seekers_views/check_job_seeker_info_for_hire.html b/itou/templates/job_seekers_views/check_job_seeker_info_for_hire.html index 88c4fa1b14..c3ccc4cb40 100644 --- a/itou/templates/job_seekers_views/check_job_seeker_info_for_hire.html +++ b/itou/templates/job_seekers_views/check_job_seeker_info_for_hire.html @@ -4,7 +4,7 @@ {% block title_content %}
-

Informations personnelles de {{ job_seeker.get_full_name|title }}

+

Informations personnelles de {{ job_seeker.get_full_name }}

{% include 'apply/includes/eligibility_badge.html' %}

Dernière actualisation du profil : {{ job_seeker.last_checked_at|date }} à {{ job_seeker.last_checked_at|time }}

diff --git a/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step1.html b/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step1.html index 89f2dc4fa2..f542f3ad86 100644 --- a/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step1.html +++ b/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step1.html @@ -4,11 +4,7 @@ {% block title %}Notifier la sanction du contrôle pour {{ evaluated_siae }} {{ block.super }}{% endblock %} -{% block title_content %} -

- Notifier la sanction du contrôle pour {{ evaluated_siae }} -

-{% endblock %} +{% block title_content %}

Notifier la sanction du contrôle pour {{ evaluated_siae }}

{% endblock %} {% block content %}
diff --git a/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step2.html b/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step2.html index 3272367954..6426d0fdbc 100644 --- a/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step2.html +++ b/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step2.html @@ -4,11 +4,7 @@ {% block title %}Notifier la sanction du contrôle pour {{ evaluated_siae }}{{ block.super }}{% endblock %} -{% block title_content %} -

- Notifier la sanction du contrôle pour {{ evaluated_siae }} -

-{% endblock %} +{% block title_content %}

Notifier la sanction du contrôle pour {{ evaluated_siae }}

{% endblock %} {% block content %}
diff --git a/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step3.html b/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step3.html index 8285bc224e..c16bda1375 100644 --- a/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step3.html +++ b/itou/templates/siae_evaluations/institution_evaluated_siae_notify_step3.html @@ -4,11 +4,7 @@ {% block title %}Notifier la sanction du contrôle pour {{ evaluated_siae }}{{ block.super }}{% endblock %} -{% block title_content %} -

- Notifier la sanction du contrôle pour {{ evaluated_siae }} -

-{% endblock %} +{% block title_content %}

Notifier la sanction du contrôle pour {{ evaluated_siae }}

{% endblock %} {% block content %}
diff --git a/tests/www/apply/test_submit.py b/tests/www/apply/test_submit.py index 0bd3b5a7b7..245be0c4fc 100644 --- a/tests/www/apply/test_submit.py +++ b/tests/www/apply/test_submit.py @@ -4869,7 +4869,8 @@ def test_company(self, client): response = client.get(url_check_infos) assertContains( response, - '

Informations personnelles de Son Prénom Son Nom De Famille

', + """

+ Informations personnelles de Son Prénom SON NOM DE FAMILLE

""", html=True, ) assertTemplateNotUsed(response, "approvals/includes/box.html") @@ -4913,7 +4914,8 @@ def test_geiq(self, client): response = client.get(url_check_infos) assertContains( response, - '

Informations personnelles de Son Prénom Son Nom De Famille

', + """

+ Informations personnelles de Son Prénom SON NOM DE FAMILLE

""", html=True, ) assertTemplateNotUsed(response, "approvals/includes/box.html") diff --git a/tests/www/approvals_views/__snapshots__/test_prolongation_requests.ambr b/tests/www/approvals_views/__snapshots__/test_prolongation_requests.ambr index 999af17358..89b48697fc 100644 --- a/tests/www/approvals_views/__snapshots__/test_prolongation_requests.ambr +++ b/tests/www/approvals_views/__snapshots__/test_prolongation_requests.ambr @@ -1519,7 +1519,7 @@
-

+

Demande de prolongation pour Jane DOE

@@ -1765,7 +1765,7 @@
-

+

Demande de prolongation pour Jane DOE

@@ -2011,7 +2011,7 @@
-

+

Demande de prolongation pour Jane DOE

diff --git a/tests/www/geiq_views/__snapshots__/tests.ambr b/tests/www/geiq_views/__snapshots__/tests.ambr index b7455b8f17..73347b9046 100644 --- a/tests/www/geiq_views/__snapshots__/tests.ambr +++ b/tests/www/geiq_views/__snapshots__/tests.ambr @@ -786,7 +786,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Bilan validé : demande de remboursement total @@ -940,7 +940,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Financement : demande de remboursement total @@ -1140,7 +1140,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Bilan validé @@ -1292,7 +1292,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Financement : totalité de l’aide accordée @@ -1492,7 +1492,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Bilan validé : solde partiellement accordé @@ -1646,7 +1646,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Financement : solde partiellement accordé @@ -1846,7 +1846,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Bilan validé : demande de remboursement partiel @@ -2000,7 +2000,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Financement : demande de remboursement partiel @@ -2200,7 +2200,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Bilan validé : solde refusé @@ -2352,7 +2352,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Financement : solde refusé @@ -2548,7 +2548,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Bilan à l’étude @@ -2696,7 +2696,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

Bilan à l’étude @@ -2875,7 +2875,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

En attente du bilan d’exécution @@ -3068,7 +3068,7 @@
-

Bilan d’exécution - 2023

+

Bilan d’exécution - 2023

En attente du bilan d’exécution diff --git a/tests/www/login/__snapshots__/tests.ambr b/tests/www/login/__snapshots__/tests.ambr index 4d76452777..1b1fab30e9 100644 --- a/tests/www/login/__snapshots__/tests.ambr +++ b/tests/www/login/__snapshots__/tests.ambr @@ -93,35 +93,6 @@
-
- ''' -# --- -# name: TestExistingUserLogin.test_login[IC] - ''' -
- - -
-

Inclusion Connect devient ProConnect

-
- - - - - - - - - -
''' # --- @@ -241,31 +212,6 @@
-
- ''' -# --- -# name: TestExistingUserLogin.test_login_disabled_provider[IC] - ''' -
- - - - - - - -
-

- Inclusion Connect est momentanément désactivé. -

-

- Afin de demander un PASS IAE en urgence, remplissez ce formulaire. -

-
- - - -
''' # --- diff --git a/tests/www/siae_evaluations_views/test_institutions_views.py b/tests/www/siae_evaluations_views/test_institutions_views.py index 0d2987d8d6..44c3f9bf3b 100644 --- a/tests/www/siae_evaluations_views/test_institutions_views.py +++ b/tests/www/siae_evaluations_views/test_institutions_views.py @@ -2058,7 +2058,9 @@ def test_access_final_refused_control_active_campaign(self, client): kwargs={"evaluated_siae_pk": evaluated_siae.pk}, ) ) - assertContains(response, f"Notifier la sanction du contrôle pour {evaluated_siae.siae.name}", count=1) + assertContains( + response, f"Notifier la sanction du contrôle pour {evaluated_siae.siae.name}", html=True, count=1 + ) assertContains( response, f"""