Merge pull request #11143 from demarches-simplifiees/a11y-miscellaneous

ETQ usager, je veux que le contenu des panneaux "Gestion des invités" et "Votre identité" soient correctement hiérarchisés

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;
     }

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
@@ -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

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)

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')

config/locales/en.yml

@@ -336,9 +336,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: '<p class="fr-h6">No user can edit this file.</p>'
+          one: '<h5 class="fr-h6">1 user can edit this file</h5>'
+          other: '<h5 class="fr-h6">%{count} users can edit this file</h5>'
         submit_dossier_yourself: "You must submit the file yourself when it is complete."
     pagination:
       next: Next

config/locales/fr.yml

@@ -329,10 +329,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: '<p class="fr-h6">Aucun invité peut modifier ce dossier.</p>'
+          one: '<h5 class="fr-h6">1 invité peut modifier ce dossier</h5>'
+          other: '<h5 class="fr-h6">%{count} invités peuvent modifier ce dossier</h5>'
         submit_dossier_yourself: "Une fois le dossier complet, vous devez le déposer vous-même."
     pagination:
       next: Suivant