Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UX/UI: Mettre a jour les classes utilitaires de font #4872

Merged
merged 2 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions itou/templates/account/account_type_selection.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="col">
<div class="card c-card p-md-5 has-one-link-inside h-100 w-100">
<div class="card-body">
<h3 class="h4 card-title font-weight-light">Vous êtes candidat en recherche d'emploi</h3>
<h3 class="h4 card-title fw-light">Vous êtes candidat en recherche d'emploi</h3>
</div>
<div class="card-footer">
<a class="btn btn-primary stretched-link" href="{% url 'login:job_seeker' %}{% redirection_url value=redirect_field_value %}">
Expand All @@ -27,7 +27,7 @@ <h3 class="h4 card-title font-weight-light">Vous êtes candidat en recherche d'e
<div class="col">
<div class="card c-card p-md-5 has-one-link-inside h-100 w-100">
<div class="card-body">
<h3 class="h4 card-title font-weight-light">Vous êtes prescripteur ou orienteur</h3>
<h3 class="h4 card-title fw-light">Vous êtes prescripteur ou orienteur</h3>
</div>
<div class="card-footer">
<a class="btn btn-primary stretched-link" href="{% url 'login:prescriber' %}{% redirection_url value=redirect_field_value %}">
Expand All @@ -39,7 +39,7 @@ <h3 class="h4 card-title font-weight-light">Vous êtes prescripteur ou orienteur
<div class="col">
<div class="card c-card p-md-5 has-one-link-inside h-100 w-100">
<div class="card-body">
<h3 class="h4 card-title font-weight-light">
<h3 class="h4 card-title fw-light">
<span class="d-block">Vous êtes un employeur inclusif</span>
</h3>
</div>
Expand All @@ -53,7 +53,7 @@ <h3 class="h4 card-title font-weight-light">
<div class="col">
<div class="card c-card p-md-5 has-one-link-inside h-100 w-100">
<div class="card-body">
<h3 class="h4 card-title font-weight-light">Vous êtes membre d’une institution partenaire</h3>
<h3 class="h4 card-title fw-light">Vous êtes membre d’une institution partenaire</h3>
</div>
<div class="card-footer">
<a class="btn btn-primary stretched-link" href="{% url 'login:labor_inspector' %}{% redirection_url value=redirect_field_value %}">
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/api/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1 class="h1-hero-c1">API Les emplois de l’inclusion</h1>
L’accès à certaines ressources peut nécessiter une authentification avec des droits particuliers.
<br />
Si vous désirez obtenir ces droits sur votre compte, ou de l’aide pour utiliser l’API, merci de
<a class="text-decoration-underline font-weight-bold text-white" href="mailto:{{ API_EMAIL_CONTACT }}" aria-label="Nous contacter par e-mail">nous contacter</a>
<a class="text-decoration-underline fw-bold text-white" href="mailto:{{ API_EMAIL_CONTACT }}" aria-label="Nous contacter par e-mail">nous contacter</a>
<i class="ri-external-link-line"></i>.
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions itou/templates/apply/includes/buttons/accept.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
{% url 'apply:accept' job_application_id=job_application.pk as accept_url %}
{% if job_application.to_company.kind != CompanyKind.GEIQ or geiq_eligibility_diagnosis and geiq_eligibility_diagnosis.is_valid %}
<a href="{{ accept_url }}" class="btn btn-lg btn-white btn-block btn-ico" {% matomo_event "candidature" "clic" "accept_application" %}>
<i class="ri-check-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-check-line fw-medium" aria-hidden="true"></i>
<span>Accepter</span>
</a>
{% else %}
{# GEIQ SIAE without valid geiq_eligibility_diagnosis, modal in apply/process_details_company.html #}
<button class="btn btn-lg btn-white btn-block btn-ico" data-bs-toggle="modal" data-bs-target="#confirm_no_allowance_modal">
<i class="ri-check-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-check-line fw-medium" aria-hidden="true"></i>
<span>Accepter</span>
</button>
{% endif %}
4 changes: 2 additions & 2 deletions itou/templates/apply/includes/buttons/new_diagnosis.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
data-bs-toggle="tooltip"
data-bs-placement="top"
title="Vous ne pouvez pas valider les critères d'éligibilité suite aux mesures prises dans le cadre du contrôle a posteriori. {{ suspension }}">
<i class="ri-check-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-check-line fw-medium" aria-hidden="true"></i>
<span>Accepter</span>
</button>
{% else %}
<a href="{% url 'apply:eligibility' job_application_id=job_application %}" class="btn btn-lg btn-white btn-block btn-ico">
<i class="ri-check-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-check-line fw-medium" aria-hidden="true"></i>
<span>Accepter</span>
</a>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/apply/includes/buttons/postpone.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load matomo %}
<a href="{% url 'apply:postpone' job_application_id=job_application.id %}" class="btn btn-lg btn-link-white btn-block btn-ico" {% matomo_event "candidature" "clic" "postpone_application" %}>
<i class="ri-history-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-history-line fw-medium" aria-hidden="true"></i>
<span>Mettre en liste d'attente</span>
</a>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
aria-label="Proposer un rendez-vous à {{ job_application.job_seeker.get_full_name }}"
{% matomo_event "candidature" "clic" "proposer-rdv" %}>
<div class="stable-text">
<i class="ri-alert-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-alert-line fw-medium" aria-hidden="true"></i>
<span>Réessayer un envoi</span>
</div>
<div class="loading-text">
Expand All @@ -25,15 +25,15 @@
</form>
{% else %}
<button class="btn btn-danger btn-ico" type="button" disabled data-bs-toggle="tooltip" data-bs-placement="left" data-bs-title="Une erreur s’est produite, l’envoi n’a pas abouti.">
<i class="ri-alert-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-alert-line fw-medium" aria-hidden="true"></i>
<span>Une erreur est survenue</span>
</button>
{% endif %}
{% elif job_application.has_pending_rdv_insertion_invitation_request %}
<button class="btn btn-success btn-ico" type="button" disabled data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true" data-bs-title="Une relance sera envoyée 3 jours après.
<br>
Vous pourrez renvoyer une invitation sous 10J.">
<i class="ri-check-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-check-line fw-medium" aria-hidden="true"></i>
<span>Invitation envoyée</span>
</button>
{% else %}
Expand All @@ -43,7 +43,7 @@
{% csrf_token %}
<button class="btn btn-secondary btn-ico" aria-label="Proposer un rendez-vous à {{ job_application.job_seeker.get_full_name }}" {% matomo_event "candidature" "clic" "proposer-rdv" %}>
<div class="stable-text">
<i class="ri-mail-send-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-mail-send-line fw-medium" aria-hidden="true"></i>
<span>Proposer un rendez-vous</span>
</div>
<div class="loading-text">
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/apply/includes/buttons/refuse.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load matomo %}
<a href="{% url 'apply:refuse' job_application_id=job_application.id step='reason' %}" class="btn btn-lg btn-outline-white btn-block btn-ico" {% matomo_event "candidature" "clic" "refuse_application" %}>
<i class="ri-close-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-close-line fw-medium" aria-hidden="true"></i>
<span>Décliner</span>
</a>
10 changes: 5 additions & 5 deletions itou/templates/apply/includes/job_application_answers.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,33 +53,33 @@ <h3>Réponse de l'employeur</h3>
Si les détails apportés dans le message de réponse ne vous ont pas permis d’en savoir plus, vous pouvez contacter l’employeur.
</p>

<p class="text-primary fs-sm font-weight-bold my-3">Coordonnées de l’employeur :</p>
<p class="text-primary fs-sm fw-bold my-3">Coordonnées de l’employeur :</p>
<ul class="list-unstyled">
{% if refused_by %}
<li class="d-flex justify-content-start align-items-center">
<a href="{% url 'companies_views:card' siae_id=job_application.to_company.pk %}" class="btn-link btn-ico">
<i class="ri-user-line ri-lg font-weight-normal"></i>
<i class="ri-user-line ri-lg fw-normal"></i>
<span>{{ refused_by.get_full_name }}</span>
</a>
</li>
{% endif %}
<li class="d-flex justify-content-start align-items-center">
<a href="{% url 'companies_views:card' siae_id=job_application.to_company.pk %}" class="btn-link btn-ico">
<i class="ri-community-line ri-lg font-weight-normal"></i>
<i class="ri-community-line ri-lg fw-normal"></i>
<span>{{ job_application.to_company.display_name }}</span>
</a>
</li>
<li class="d-flex justify-content-start align-items-center">
<a href="mailto:{{ refusal_contact_email }}" class="btn-link btn-ico">
<i class="ri-mail-line ri-lg font-weight-normal"></i>
<i class="ri-mail-line ri-lg fw-normal"></i>
<span>{{ refusal_contact_email }}</span>
</a>
{% matomo_event "candidature" "clic" "prescriber_copied_company_email" as matomo_event_attrs %}
{% include "includes/copy_to_clipboard.html" with content=refusal_contact_email css_classes="btn-ico btn-link btn-sm ms-2 py-0" matomo_event_attrs=matomo_event_attrs placement="right" %}
</li>
<li class="d-flex justify-content-start align-items-center">
<a href="tel:{{ job_application.to_company.phone|cut:" " }}" class="btn-link btn-ico">
<i class="ri-phone-line ri-lg font-weight-normal"></i>
<i class="ri-phone-line ri-lg fw-normal"></i>
<span>{{ job_application.to_company.phone }}</span>
</a>
{% matomo_event "candidature" "clic" "prescriber_copied_company_phone" as matomo_event_attrs %}
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/apply/includes/job_application_info.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<li class="list-group-item list-group-item-action py-2">
<a class="d-flex flex-wrap align-items-center text-decoration-none" href="{{ job.get_absolute_url }}?back_url={{ request.get_full_path|urlencode }}">
<div class="d-inline">
<span class="font-weight-bold me-1 me-md-2">{{ job.display_name }} ({{ job.appellation.rome_id }})</span>
<span class="fw-bold me-1 me-md-2">{{ job.display_name }} ({{ job.appellation.rome_id }})</span>
</div>
<div class="d-inline ms-lg-auto">
<span class="fs-sm text-nowrap">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h3 id="delete_prior_action_{{ prior_action.pk }}_title">Suppression de l'action
Annuler
</button>
<button class="btn btn-danger btn-sm" data-bs-dismiss="modal" aria-label="Supprimer l'action préalable à l'embauche">
<i class="ri-delete-bin-line font-weight-normal" aria-hidden="true"></i>
<i class="ri-delete-bin-line fw-normal" aria-hidden="true"></i>
<span>Supprimer</span>
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% if list_exports_url %}
<div id="job-applications-export-link"{% if request.htmx %} hx-swap-oob="true"{% endif %}>
<a href="{{ list_exports_url }}?back_url={{ request.get_full_path|urlencode }}" class="btn btn-lg btn-ico btn-secondary" aria-label="Exporter la liste de candidatures">
<i class="ri-download-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-download-line fw-medium" aria-hidden="true"></i>
<span>Exporter</span>
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="c-offcanvas-filters offcanvas offcanvas-end" tabindex="-1" aria-labelledby="offcanvasApplyFiltersLabel" id="offcanvasApplyFilters">
<div class="offcanvas-header">
<h4 class="mb-0 btn-ico" id="offcanvasApplyFiltersLabel">
<i class="ri-sound-module-fill font-weight-medium" aria-hidden="true"></i>
<i class="ri-sound-module-fill fw-medium" aria-hidden="true"></i>
<span>Filtrer</span>
</h4>
<button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Fermer"></button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% include "apply/includes/job_applications_filters/selected_jobs.html" with btn_dropdown_filter=True %}
{% include "apply/includes/job_applications_filters/departments.html" with btn_dropdown_filter=True %}
<button type="button" class="btn btn-ico btn-dropdown-filter" data-bs-toggle="offcanvas" data-bs-target="#offcanvasApplyFilters" aria-controls="offcanvasApplyFilters">
<i class="ri-sound-module-fill font-weight-bold" aria-hidden="true"></i>
<i class="ri-sound-module-fill fw-bold" aria-hidden="true"></i>
<span>Tous les filtres <span id="all-filters-btn"></span></span>
</button>
{% include "apply/includes/list_reset_filters.html" with btn_dropdown_filter=True %}
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/apply/includes/job_seeker_info.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h3 class="mb-0">Informations personnelles</h3>
class="btn btn-ico btn-outline-primary{% if not can_edit_personal_information %} disabled{% endif %}"
{% if with_matomo_event %}{% matomo_event "salaries" "clic" "edit_jobseeker_infos" %}{% endif %}
aria-label="Modifier les informations personnelles de {{ job_seeker.get_full_name|mask_unless:can_view_personal_information }}">
<i class="ri-pencil-line font-weight-medium" aria-hidden="true"></i>
<i class="ri-pencil-line fw-medium" aria-hidden="true"></i>
<span>Modifier</span>
</a>
{% if not can_edit_personal_information %}
Expand Down
4 changes: 2 additions & 2 deletions itou/templates/apply/includes/list_card_body_company.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h3>
<div class="d-flex flex-column flex-md-row align-items-start align-items-md-end gap-1 gap-md-2">
{% if job_application.job_seeker.city %}
<span>
<i class="ri-map-pin-2-line font-weight-normal me-1" aria-hidden="true"></i>
<i class="ri-map-pin-2-line fw-normal me-1" aria-hidden="true"></i>
{% if job_application.job_seeker.department %}{{ job_application.job_seeker.department }} -{% endif %}
{{ job_application.job_seeker.city|title }}
</span>
Expand Down Expand Up @@ -45,7 +45,7 @@ <h3>
{% endif %}
{% if job_application.next_appointment_start_at %}
<span {% if job_application.other_appointments_count %} data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-title="{% blocktrans count other_appointments_count=job_application.other_appointments_count %}{{ other_appointments_count }} autre rendez-vous prévu, rendez-vous dans le détail de candidature pour le consulter"{% plural %}{{ other_appointments_count }} autres rendez-vous prévus, rendez-vous dans le détail de candidature pour les consulter{% endblocktrans%}"{% endif %}>
<i class="ri-calendar-line font-weight-normal me-1" aria-hidden="true"></i>
<i class="ri-calendar-line fw-normal me-1" aria-hidden="true"></i>
Prochain rdv le {{ job_application.next_appointment_start_at|date:"d/m/Y" }}
</span>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion itou/templates/apply/includes/list_card_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<span class="text-secondary fs-sm">{{ job_application.created_at|date:"d F Y à H:i" }}</span>
{% if job_application.pending_for_weeks >= job_application.WEEKS_BEFORE_CONSIDERED_OLD and not request.user.is_job_seeker %}
<br>
<span class="text-danger fs-sm font-weight-bold">
<span class="text-danger fs-sm fw-bold">
En attente de réponse depuis {{ job_application.pending_for_weeks }} semaines.
</span>
{% endif %}
Expand Down
6 changes: 3 additions & 3 deletions itou/templates/apply/includes/list_job_applications.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@
</p>
{% if job_applications_list_kind is JobApplicationsListKind.SENT %}
<a href="{% url 'search:employers_results' %}" class="btn btn-outline-primary btn-ico w-100 w-md-auto justify-content-center">
<i class="ri-user-follow-line ri-lg font-weight-normal"></i>
<i class="ri-user-follow-line ri-lg fw-normal"></i>
<span>Postuler pour un candidat</span>
</a>
{% elif job_applications_list_kind is JobApplicationsListKind.RECEIVED %}
<a href="{% url 'companies_views:job_description_list' %}" class="btn btn-outline-primary btn-ico w-100 w-md-auto justify-content-center">
<i class="ri-briefcase-line ri-lg font-weight-normal"></i>
<i class="ri-briefcase-line ri-lg fw-normal"></i>
<span>Gérer les métiers et recrutements</span>
</a>
{% elif job_applications_list_kind is JobApplicationsListKind.SENT_FOR_ME %}
<a href="{% url 'search:employers_home' %}" class="btn btn-outline-primary btn-ico w-100 w-md-auto justify-content-center">
<i class="ri-briefcase-line ri-lg font-weight-normal"></i>
<i class="ri-briefcase-line ri-lg fw-normal"></i>
<span>Rechercher un emploi inclusif</span>
</a>
{% endif %}
Expand Down
Loading