Skip to content

Commit

Permalink
feat: update bages alignment in .s-title-02
Browse files Browse the repository at this point in the history
  • Loading branch information
hellodeloo committed Jan 28, 2025
1 parent 20686c4 commit 9dbb2a4
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 98 deletions.
2 changes: 1 addition & 1 deletion itou/templates/apply/process_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% block title_content %}
<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">
Candidature de
{% if with_job_seeker_detail_url|default:False %}
<a href="{% url "job_seekers_views:details" public_id=job_application.job_seeker.public_id %}?back_url={{ request.get_full_path|urlencode }}" class="btn-link">{{ job_application.job_seeker.get_full_name|mask_unless:can_view_personal_information }}</a>
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/apply/submit/application/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{% block title_content %}
{% if not job_app_to_transfer|default:False %}
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">{% include 'apply/includes/_submit_title.html' %}</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">{% include 'apply/includes/_submit_title.html' %}</h1>
{% include 'apply/includes/eligibility_badge.html' %}
</div>
<p>
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/approvals/prolongation_requests/show.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% block title_content %}
<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">
Demande de prolongation pour {{ prolongation_request.approval.user.get_full_name }}
</h1>
{% include "approvals/prolongation_requests/_status_badge.html" with badge_size="badge-base" %}
Expand Down
6 changes: 1 addition & 5 deletions itou/templates/approvals/suspend.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
{% block title %}Déclarer une suspension de PASS IAE {{ block.super }}{% endblock %}

{% block title_content %}
<h1>
Déclarer une suspension de PASS IAE
<br>
<span class="text-muted">{{ approval.user.get_full_name }}</span>
</h1>
<h1>Déclarer une suspension de PASS IAE pour {{ approval.user.get_full_name }}</h1>
{% endblock %}

{% block content %}
Expand Down
14 changes: 6 additions & 8 deletions itou/templates/companies/job_description_card.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

<div class="d-flex flex-column flex-md-row gap-3 mb-3 mb-md-4 justify-content-md-between">
<div>
<h1 class="mb-0">{{ job.display_name }}</h1>
<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">{{ job.display_name }}</h1>
{% if job.is_active %}
<p class="mt-1 mb-0">
<span class="badge rounded-pill bg-success">
{{ job.open_positions }} {{ job.open_positions|pluralizefr:"poste ouvert,postes ouverts" }} au recrutement
</span>
</p>
<span class="badge rounded-pill bg-success">
{{ job.open_positions }} {{ job.open_positions|pluralizefr:"poste ouvert,postes ouverts" }} au recrutement
</span>
{% endif %}
</div>
{% if can_update_job_description %}
Expand Down
12 changes: 7 additions & 5 deletions itou/templates/employee_record/summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
<h1>Détail fiche salarié ASP: {{ employee_record.job_application.job_seeker.get_full_name }}</h1>
<p>{% include 'employee_record/includes/_status.html' with employee_record=employee_record only %}</p>
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-1 mb-xl-0 me-xl-3">
Fiche salarié ASP : {{ employee_record.job_application.job_seeker.get_full_name }}
</h1>
{% include 'employee_record/includes/_status.html' with employee_record=employee_record only %}
</div>
{% endblock %}

{% block content %}
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/geiq/assessment_info_for_employer.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% block title_content %}
<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - {{ assessment.campaign.year }}</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - {{ assessment.campaign.year }}</h1>
{% if not assessment.submitted_at %}
<span class="badge badge-base rounded-pill text-nowrap bg-warning">En attente du bilan d’exécution</span>
{% elif not assessment.reviewed_at %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% block title_content %}
<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - {{ assessment.campaign.year }}</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - {{ assessment.campaign.year }}</h1>
{% include "geiq/includes/labor_inspector_assessment_state_badge.html" with assessment=assessment extra_class="" ReviewState=ReviewState only %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/geiq/assessment_review.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% block title_content %}
<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Valider le bilan d’exécution - {{ assessment.campaign.year }}</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Valider le bilan d’exécution - {{ assessment.campaign.year }}</h1>
{% include "geiq/includes/labor_inspector_assessment_state_badge.html" with assessment=assessment extra_class="" ReviewState=ReviewState only %}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{% block title_content %}
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Informations personnelles de {{ job_seeker.get_full_name|title }}</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Informations personnelles de {{ job_seeker.get_full_name|title }}</h1>
{% include 'apply/includes/eligibility_badge.html' %}
</div>
<p>Dernière actualisation du profil : {{ job_seeker.last_checked_at|date }} à {{ job_seeker.last_checked_at|time }}</p>
Expand Down
6 changes: 4 additions & 2 deletions tests/www/apply/test_submit.py
Original file line number Diff line number Diff line change
Expand Up @@ -4869,7 +4869,8 @@ def test_company(self, client):
response = client.get(url_check_infos)
assertContains(
response,
'<h1 class="mb-0 me-3 text-md-nowrap">Informations personnelles de Son Prénom Son Nom De Famille</h1>',
"""<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">
Informations personnelles de Son Prénom Son Nom De Famille</h1>""",
html=True,
)
assertTemplateNotUsed(response, "approvals/includes/box.html")
Expand Down Expand Up @@ -4913,7 +4914,8 @@ def test_geiq(self, client):
response = client.get(url_check_infos)
assertContains(
response,
'<h1 class="mb-0 me-3 text-md-nowrap">Informations personnelles de Son Prénom Son Nom De Famille</h1>',
"""<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">
Informations personnelles de Son Prénom Son Nom De Famille</h1>""",
html=True,
)
assertTemplateNotUsed(response, "approvals/includes/box.html")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">
Demande de prolongation pour Jane DOE
</h1>

Expand Down Expand Up @@ -1765,7 +1765,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">
Demande de prolongation pour Jane DOE
</h1>

Expand Down Expand Up @@ -2011,7 +2011,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">
Demande de prolongation pour Jane DOE
</h1>

Expand Down
28 changes: 14 additions & 14 deletions tests/www/geiq_views/__snapshots__/tests.ambr
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-warning">Bilan validé : demande de remboursement total</span>
Expand Down Expand Up @@ -940,7 +940,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-warning">Financement : demande de remboursement total</span>
Expand Down Expand Up @@ -1140,7 +1140,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-success">Bilan validé</span>
Expand Down Expand Up @@ -1292,7 +1292,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-success">Financement : totalité de l’aide accordée</span>
Expand Down Expand Up @@ -1492,7 +1492,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-success">Bilan validé : solde partiellement accordé</span>
Expand Down Expand Up @@ -1646,7 +1646,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-success">Financement : solde partiellement accordé</span>
Expand Down Expand Up @@ -1846,7 +1846,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-warning">Bilan validé : demande de remboursement partiel</span>
Expand Down Expand Up @@ -2000,7 +2000,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-warning">Financement : demande de remboursement partiel</span>
Expand Down Expand Up @@ -2200,7 +2200,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-warning">Bilan validé : solde refusé</span>
Expand Down Expand Up @@ -2352,7 +2352,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>


<span class="badge badge-base rounded-pill text-nowrap bg-warning">Financement : solde refusé</span>
Expand Down Expand Up @@ -2548,7 +2548,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>

<span class="badge badge-base rounded-pill text-nowrap bg-info">Bilan à l’étude</span>

Expand Down Expand Up @@ -2696,7 +2696,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>

<span class="badge badge-base rounded-pill text-nowrap bg-info">Bilan à l’étude</span>

Expand Down Expand Up @@ -2875,7 +2875,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>

<span class="badge badge-base rounded-pill text-nowrap bg-warning">En attente du bilan d’exécution</span>

Expand Down Expand Up @@ -3068,7 +3068,7 @@

<div class="d-flex flex-column flex-md-row gap-3 mb-3 justify-content-md-between">
<div class="d-xl-flex align-items-xl-center">
<h1 class="mb-0 me-3 text-md-nowrap">Bilan d’exécution - 2023</h1>
<h1 class="mb-1 mb-xl-0 me-xl-3 text-xl-nowrap">Bilan d’exécution - 2023</h1>

<span class="badge badge-base rounded-pill text-nowrap bg-warning">En attente du bilan d’exécution</span>

Expand Down
54 changes: 0 additions & 54 deletions tests/www/login/__snapshots__/tests.ambr
Original file line number Diff line number Diff line change
Expand Up @@ -93,35 +93,6 @@
</div>


</div>
'''
# ---
# name: TestExistingUserLogin.test_login[IC]
'''
<div class="c-form mb-5">


<div class="alert alert-important">
<p class="mb-0">Inclusion Connect devient ProConnect</p>
</div>





<div class="text-center">
<a class="proconnect-button" data-matomo-action="clic" data-matomo-category="connexion prescripteur" data-matomo-event="true" data-matomo-option="se-connecter-avec-pro-connect" href="/pro_connect/authorize?user_kind=prescriber&amp;previous_url=%2Flogin%2Fexisting%2Fc0fee70e-cf34-4d37-919d-a1ae3e3bf7e5%3Fback_url%3D%2Fsignup%2F">
</a>
<p>
<a href="https://proconnect.gouv.fr/" rel="noopener noreferrer" target="_blank" title="Qu’est-ce que AgentConnect ? - nouvelle fenêtre">
Qu’est-ce que ProConnect ?
</a>
</p>
</div>




</div>
'''
# ---
Expand Down Expand Up @@ -241,31 +212,6 @@
</div>


</div>
'''
# ---
# name: TestExistingUserLogin.test_login_disabled_provider[IC]
'''
<div class="c-form mb-5">







<div class="alert alert-info" role="status">
<p class="mb-2">
<strong>Inclusion Connect est momentanément désactivé.</strong>
</p>
<p class="mb-0">
Afin de demander un PASS IAE en urgence, <a class="has-external-link" href="https://tally.so/r/nrj0V5" target="_blank">remplissez ce formulaire.</a>
</p>
</div>




</div>
'''
# ---
Expand Down

0 comments on commit 9dbb2a4

Please sign in to comment.