From d2a7bced4face6fb4f6389dda9d23e6b450df58c Mon Sep 17 00:00:00 2001 From: Corinne Durrmeyer Date: Fri, 29 Nov 2024 16:27:03 +0100 Subject: [PATCH 1/4] fix(invite): Remove title when there is no guest list --- app/views/invites/_form.html.haml | 2 +- config/locales/en.yml | 7 ++++--- config/locales/fr.yml | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml index 8f3922f6f..2a3c75fd2 100644 --- a/app/views/invites/_form.html.haml +++ b/app/views/invites/_form.html.haml @@ -2,7 +2,7 @@ %h4.fr-h5= t('views.invites.form.modal_title') %p.fr-highlight.fr-mb-3w= t('views.invites.form.modal_highlight') - %h5.fr-h6= t('views.invites.form.edit_dossier', count: invites.size) + = t('views.invites.form.edit_dossier_html', count: invites.size) - if invites.present? #invite-list %ul diff --git a/config/locales/en.yml b/config/locales/en.yml index 802577728..8c89bb1e0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -338,9 +338,10 @@ en: send_invitation: Send an invitation withdraw_permission: "Withdraw the permission" want_to_withdraw_permission: "Would you like to withdraw the permission of %{email}?" - edit_dossier: - one: "1 user can edit this file." - other: "%{count} users can edit this file." + edit_dossier_html: + zero: '

No user can edit this file.

' + one: '
1 user can edit this file
' + other: '
%{count} users can edit this file
' submit_dossier_yourself: "You must submit the file yourself when it is complete." pagination: next: Next diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 40a068d49..0aa08fb2d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -331,10 +331,10 @@ fr: send_invitation: Envoyer une invitation withdraw_permission: "Révoquer l’autorisation" want_to_withdraw_permission: "Souhaitez-vous supprimer l’autorisation de %{email} ?" - edit_dossier: - zero: "Aucun invité peut modifier ce dossier" - one: "1 invité peut modifier ce dossier" - other: "%{count} invités peuvent modifier ce dossier" + edit_dossier_html: + zero: '

Aucun invité peut modifier ce dossier.

' + one: '
1 invité peut modifier ce dossier
' + other: '
%{count} invités peuvent modifier ce dossier
' submit_dossier_yourself: "Une fois le dossier complet, vous devez le déposer vous-même." pagination: next: Suivant From 1641f1e82f9d34da7295a6ad0b8adb26541f7a29 Mon Sep 17 00:00:00 2001 From: Corinne Durrmeyer Date: Mon, 16 Dec 2024 10:48:40 +0100 Subject: [PATCH 2/4] refactor(invites-form): Remove useless aria-labelledby --- app/views/invites/_form.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml index 2a3c75fd2..1743778dc 100644 --- a/app/views/invites/_form.html.haml +++ b/app/views/invites/_form.html.haml @@ -15,9 +15,9 @@ - if dossier.brouillon? %p= t('views.invites.form.submit_dossier_yourself') - = form_tag dossier_invites_path(dossier), data: { turbo: true, turbo_force: :server }, method: :post, aria: { labelledby: 'invite-form-legend' } do + = form_tag dossier_invites_path(dossier), data: { turbo: true, turbo_force: :server }, method: :post do %fieldset.fr-fieldset - %legend.fr-fieldset__legend#invite-form-legend + %legend.fr-fieldset__legend %h5.fr-h6= t('views.invites.form.title') .fr-fieldset__element From e804af6539e81ffe17889a21045980e3db00c186 Mon Sep 17 00:00:00 2001 From: Corinne Durrmeyer Date: Mon, 16 Dec 2024 14:44:06 +0100 Subject: [PATCH 3/4] refactor(identite_individual): Replace
&

sequence with

--- app/assets/stylesheets/demande.scss | 11 ++++---- .../dossiers/_identite_individual.html.haml | 28 +++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/demande.scss b/app/assets/stylesheets/demande.scss index b84008c18..e4fbe1ab9 100644 --- a/app/assets/stylesheets/demande.scss +++ b/app/assets/stylesheets/demande.scss @@ -8,10 +8,16 @@ .champ-label { margin-bottom: 0; + padding-bottom: 0; font-size: 0.8rem; font-weight: 300; } + dt.champ-label::after { + content: ' :'; + speak: none; + } + .champ-content { padding: 0 0 0.5rem; font-weight: 600; @@ -20,11 +26,6 @@ font-weight: normal; } - p { - padding: 0; - margin: 0; - } - ul { margin-block-start: 0; } diff --git a/app/views/shared/dossiers/_identite_individual.html.haml b/app/views/shared/dossiers/_identite_individual.html.haml index 2c0697b66..d4eddebc5 100644 --- a/app/views/shared/dossiers/_identite_individual.html.haml +++ b/app/views/shared/dossiers/_identite_individual.html.haml @@ -1,17 +1,17 @@ +%dl.fr-pl-0 + .champ-row + %dt.champ-label= t('views.users.dossiers.identite.civility') + %dd.champ-content= dossier.individual.gender -= render Dossiers::RowShowComponent.new(label: t('views.users.dossiers.identite.civility')) do |c| - - c.with_value do - %p= dossier.individual.gender + .champ-row + %dt.champ-label= t('views.users.dossiers.identite.first_name') + %dd.champ-content= dossier.individual.prenom -= render Dossiers::RowShowComponent.new(label: t('views.users.dossiers.identite.first_name')) do |c| - - c.with_value do - %p= dossier.individual.prenom + .champ-row + %dt.champ-label= t('views.users.dossiers.identite.last_name') + %dd.champ-content= dossier.individual.nom -= render Dossiers::RowShowComponent.new(label: t('views.users.dossiers.identite.last_name')) do |c| - - c.with_value do - %p= dossier.individual.nom - -- if dossier.individual.birthdate.present? - = render Dossiers::RowShowComponent.new(label: t('views.users.dossiers.identite.birthdate')) do |c| - - c.with_value do - %p= try_format_date(dossier.individual.birthdate) + - if dossier.individual.birthdate.present? + .champ-row + %dt.champ-label= t('views.users.dossiers.identite.birthdate') + %dd.champ-content= try_format_date(dossier.individual.birthdate) From 274407ed33b7c3fbada8668c6939cb5152fa2c07 Mon Sep 17 00:00:00 2001 From: Corinne Durrmeyer Date: Mon, 16 Dec 2024 14:57:40 +0100 Subject: [PATCH 4/4] fix(merci): correct title hierarchy --- app/views/users/dossiers/_merci.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/dossiers/_merci.html.haml b/app/views/users/dossiers/_merci.html.haml index d131104f6..1d367a231 100644 --- a/app/views/users/dossiers/_merci.html.haml +++ b/app/views/users/dossiers/_merci.html.haml @@ -3,8 +3,8 @@ .fr-grid-row.fr-col-offset-md-2.fr-col-md-8 .fr-col-12 = image_tag('user/envoi-dossier.svg', alt: '', class: 'mt-8') - %h1.fr-mt-4w.fr-mb-3w.mx-0= t('views.users.dossiers.merci.thanks') - %h2.send.fr-m-2w.text-lg + %p.fr-h1.fr-mt-4w= t('views.users.dossiers.merci.thanks') + %h1.send.fr-m-2w.text-lg = t('views.users.dossiers.merci.dossier_send_l1') %strong= procedure.libelle = t('views.users.dossiers.merci.dossier_send_l2')