Merge pull request #8979 from demarches-simplifiees/8054-a11y-ways-of-navigating

a11y : 8054 a11y ways of navigating

app/assets/images/footer/logo-beta-gouv-fr.svg

@@ -1 +0,0 @@
-<svg height="53" width="318" xmlns="http://www.w3.org/2000/svg"><g fill="#373c42"><path d="m10.4 37.632c2.496 2.208 5.044 3.36 8.528 3.36 7.02 0 13.208-5.568 13.208-13.392 0-7.968-5.928-13.44-13.052-13.44-3.328 0-6.188 1.152-8.684 3.456v-12.624h-6.916v35.328h6.916zm7.28-17.616c4.576 0 7.488 3.36 7.488 7.536 0 4.368-3.172 7.584-7.488 7.584-4.264 0-7.592-3.024-7.592-7.632 0-4.464 3.172-7.488 7.592-7.488zm40.204 12.816c-1.924 1.728-3.9 2.496-6.864 2.496-3.952 0-7.072-2.112-7.748-5.904h22.256c0-.576.052-.864.052-1.44 0-8.064-5.928-13.824-14.664-13.824-8.892 0-14.352 6.432-14.352 13.392 0 7.488 5.668 13.44 14.456 13.44 5.824 0 9.724-1.728 12.688-5.616zm-14.3-8.448c1.352-3.216 4.004-4.8 7.436-4.8 3.692 0 6.656 1.824 7.592 4.8zm28.27-9.552h-3.534v5.472h3.535v20.016h6.916v-20.016h4.11v-5.472h-4.11v-9.408h-6.91v9.408zm35.246 25.488h6.916v-25.488h-6.916v2.784c-2.496-2.304-5.356-3.456-8.684-3.456-7.176 0-13 5.472-13 13.44 0 7.824 6.136 13.392 13.156 13.392 3.484 0 6.084-1.152 8.528-3.36zm-7.28-20.304c4.368 0 7.592 3.024 7.592 7.488 0 4.656-3.328 7.632-7.592 7.632-4.316 0-7.436-3.216-7.436-7.584 0-4.176 2.86-7.536 7.436-7.536zm24.968 13.632c-2.184 0-4.004 1.584-4.004 3.648 0 2.016 1.82 3.696 4.004 3.696 2.236 0 3.952-1.68 3.952-3.696s-1.768-3.648-3.952-3.648zm38.08-18.816h-6.917v2.784c-2.6-2.256-5.3-3.456-8.73-3.456-7.02 0-12.89 5.184-12.89 13.056 0 7.632 5.83 13.104 13.26 13.104 3.59 0 6.09-1.104 8.37-3.168 0 2.4-.05 4.128-1.71 5.568-1.25 1.056-3.33 1.68-5.87 1.68-2.91 0-4.99-.672-6.4-2.208h-7.64c1.87 5.328 6.71 8.064 14.3 8.064 4.21 0 7.54-.912 10.04-2.832 3.17-2.496 4.21-5.808 4.21-10.752v-21.84zm-14.093 5.184c4.576 0 7.54 3.168 7.54 7.296 0 4.32-3.172 7.152-7.436 7.152-4.32 0-7.6-2.976-7.6-7.2 0-3.936 2.91-7.248 7.49-7.248zm34.068-5.856c-7.54 0-14.3 5.712-14.3 13.44 0 7.488 6.344 13.392 14.352 13.392 8.424 0 14.612-6.048 14.612-13.44 0-7.536-6.604-13.392-14.664-13.392zm.104 6.048c4.524 0 7.592 3.072 7.592 7.392 0 4.464-3.33 7.344-7.6 7.344-4.47 0-7.44-3.072-7.44-7.392 0-4.224 3.12-7.344 7.43-7.344zm20.16 6.288c0 2.112-.105 3.312.26 5.376 1.09 5.952 5.2 9.072 11.855 9.072 3.848 0 6.708-.96 8.892-3.216 2.912-2.976 3.224-6.432 3.224-11.136v-11.76h-6.916v13.584c0 4.32-1.508 6.672-5.2 6.672-3.64 0-5.2-2.4-5.2-6.96v-13.296h-6.916v11.664zm40.07 13.824h4.47l11.753-25.488h-7.02l-6.968 15.024-6.968-15.024h-7.072l11.804 25.488zm21.679-4.72q1.228 0 2.057.79.857.766.857 1.873 0 1.108-.857 1.9-.857.763-2.057.763t-2.057-.764q-.83-.79-.83-1.9 0-1.106.83-1.87.85-.792 2.05-.792zm27.108-18.51-.515 1.74h-4.17l-3.15 11.523q-2.09 7.62-4.2 11.786-3 5.88-6.46 8.12-2.63 1.71-5.26 1.71-1.72 0-2.92-.95-.89-.66-.89-1.72 0-.85.74-1.48.71-.61 1.77-.61.77 0 1.31.45.51.45.51 1.03 0 .58-.6 1.08-.46.37-.46.55 0 .23.2.37.255.18.8.18 1.226 0 2.6-.72 1.34-.71 2.4-2.14 1.054-1.4 1.996-4.06.4-1.11 2.146-7.31l4.97-17.85h-4.97l.4-1.74q2.37 0 3.315-.29.942-.314 1.713-1.16.8-.87 2.056-3.214 1.69-3.16 3.23-4.9 2.11-2.345 4.424-3.506 2.343-1.18 4.4-1.18 2.17 0 3.485 1.027 1.32 1.006 1.32 2.19 0 .926-.658 1.558-.658.63-1.687.63-.89 0-1.46-.47-.54-.475-.54-1.134 0-.42.37-1.03.37-.63.37-.84 0-.37-.26-.553-.37-.266-1.086-.266-1.8 0-3.23 1.058-1.913 1.4-3.43 4.38-.77 1.557-2.824 7.727h4.2z"/><path d="m293.906 17.934 9.855-1.476-4.11 12.814q5-7.884 9.09-11.02 2.32-1.794 3.77-1.794.95 0 1.49.527.55.5.55 1.477 0 1.74-.97 3.322-.68 1.186-1.97 1.186-.65 0-1.14-.395-.45-.396-.57-1.213-.06-.5-.26-.66-.22-.21-.54-.21-.48 0-.91.21-.74.37-2.25 2.057-2.37 2.58-5.14 6.69-1.19 1.74-2.05 3.93-1.2 3-1.37 3.61l-.912 3.32h-4.37l5.28-16.38q.915-2.85.915-4.06 0-.48-.43-.79-.57-.42-1.51-.42-.6 0-2.2.23l-.2-.98z"/></g></svg>

app/views/layouts/procedure_context.html.haml

@@ -17,6 +17,6 @@
   - if procedure
     = render partial: 'users/procedure_footer', locals: { procedure: procedure, dossier: @dossier }
   - else
-    = render partial: 'users/dossiers/index_footer'
+    = render partial: "root/footer"
 
 = render template: 'layouts/application'

app/views/root/_footer.html.haml

@@ -42,11 +42,9 @@
     .fr-footer__body
       .fr-footer__brand.fr-enlarge-link
         %p.fr-logo
-          premier
+          gouvernement
-          %br
+        = link_to t("links.footer.dinum.url"), title: t("links.footer.dinum.title"), class: "fr-footer__brand-link" do
-          ministre
+          = image_tag("footer/logo-dinum.svg", class: "fr-footer__logo logo-beta-gouv-fr", alt: t("links.footer.dinum.alt"))
-        = link_to t("links.footer.betagouv.url"), title: t("links.footer.betagouv.title"), class: "fr-footer__brand-link" do
-          = image_tag("footer/logo-beta-gouv-fr.svg", class: "fr-footer__logo logo-beta-gouv-fr", alt: "beta.gouv.fr")
       .fr-footer__content
         %p.fr-footer__content-desc
           = t('links.footer.description_1')

app/views/users/_procedure_footer.html.haml

@@ -1,9 +1,15 @@
-%footer.fr-footer#footer{ role: "contentinfo" }
+%footer.fr-footer.footer-procedure#footer{ role: "contentinfo" }
   - service = procedure.service
-  .fr-footer__top
+  .fr-footer__top.fr-mb-0
     .fr-container
       .fr-grid-row.fr-grid-row--start.fr-grid-row--gutters
         .fr-col-12.fr-col-sm-4.fr-col-md-4
+          - if service.present?
+            %h3.fr-footer__top-cat= I18n.t('users.procedure_footer.managed_by.header')
+            .fr-footer__top-link.fr-pb-2w
+              %span{ lang: :fr }= "#{service.nom}, #{service.organisme},"
+              %div{ lang: :fr }
+                = render SimpleFormatComponent.new(service.adresse, class_names_map: {paragraph: 'fr-footer__content-desc'})
           %h3.fr-footer__top-cat= I18n.t('users.procedure_footer.contact.header')
           %ul.fr-footer__top-list
             - if dossier.present? && dossier.messagerie_available?
@@ -11,7 +17,10 @@
                 = link_to I18n.t('users.procedure_footer.contact.in_app_mail.link'), messagerie_dossier_path(dossier), class: 'fr-footer__top-link'
             - elsif service.present?
               %li
-                = link_to I18n.t('users.procedure_footer.contact.email.link', service_email: service.email), "mailto:#{service.email}", class: 'fr-footer__top-link'
+                %span.fr-footer__top-link
+                  = I18n.t('users.procedure_footer.contact.email.link')
+                = link_to service.email, "mailto:#{service.email}", class: "fr-footer__top-link"
+
               - if service.telephone.present? || service.horaires.present?
                 %li
                   - horaires = "#{I18n.t('users.procedure_footer.contact.schedule.prefix')}#{formatted_horaires(service.horaires)}"
@@ -22,9 +31,6 @@
                       - if service.horaires.present?
                         %p
                           = horaires
-              %li
-                = link_to I18n.t('users.procedure_footer.contact.stats.link'), statistiques_path(procedure.path), class: 'fr-footer__top-link', rel: 'noopener'
-
 
         - politiques = politiques_conservation_de_donnees(procedure)
         - if politiques.present?
@@ -47,35 +53,21 @@
                 %li
                   = link_to url_or_email_to_lien_dpo(procedure), rel: 'noopener', class: 'fr-footer__top-link' do
                     = I18n.t("users.procedure_footer.legals.dpo")
+              %li
+                = link_to I18n.t('users.procedure_footer.contact.stats.link'), statistiques_path(procedure.path), class: 'fr-footer__top-link', rel: 'noopener'
 
 
         .fr-col-12.fr-col-sm-4.fr-col-md-4
           %h3.fr-footer__top-cat= I18n.t('users.procedure_footer.dematerialisation.header')
-          %ul.fr-footer__top-list
+          .fr-download
-            %li
+            %p
-              = link_to t('users.procedure_footer.dematerialisation.title_1'), commencer_dossier_vide_for_revision_path(procedure.active_revision), class: 'fr-footer__top-link'
+              = link_to I18n.t('users.procedure_footer.dematerialisation.title_1'), commencer_dossier_vide_for_revision_path(procedure.active_revision), class: 'fr-footer__top-link fr-download__link'
-            %li
+          %h3.fr-footer__top-cat= I18n.t('users.procedure_footer.support.header')
-              = link_to t('users.procedure_footer.dematerialisation.title_2'), t('users.procedure_footer.dematerialisation.link'), class: 'fr-footer__top-link', title: new_tab_suffix(t("users.procedure_footer.dematerialisation.title_2")), **external_link_attributes
+          .fr-footer__brand.fr-enlarge-link
+            = link_to t("users.procedure_footer.dematerialisation.link"), title: t("users.procedure_footer.dematerialisation.alt"), class: "fr-footer__brand-link" do
+              = image_tag("footer/logo-france-services.svg", class: "fr-footer__logo logo-france-service-fr", alt: t("users.procedure_footer.dematerialisation.alt"))
 
-  .fr-container
+  .fr-footer__bottom.fr-mt-0
-    .fr-footer__body
+    .fr-container
-      .fr-footer__brand.fr-enlarge-link
-        = link_to t("links.provider.url"), title: t("links.provider.title") do
-          %p.fr-logo
-            premier
-            %br
-            ministre
-
-      - if service.present?
-        .fr-footer__content
-
-          %p.fr-footer__content-desc
-            = I18n.t('users.procedure_footer.managed_by.header')
-            %span{ lang: :fr }= "#{service.nom}, #{service.organisme},"
-          %div{ lang: :fr }
-            = render SimpleFormatComponent.new(service.adresse, class_names_map: {paragraph: 'fr-footer__content-desc'})
-            = render partial: "shared/footer_content_list"
-
-    .fr-footer__bottom
       = render partial: 'users/general_footer_row', locals: { dossier: dossier }
       = render partial: 'shared/footer_copy'

app/views/users/dossiers/_index_footer.html.haml

@@ -1,3 +1,4 @@
-%footer.procedure-footer
+%footer.procedure-footer.fr-footer__bottom{ role: "contentinfo" }
-  .container
+  .fr-container
     = render partial: "users/general_footer_row", locals: { dossier: nil }
+    = render partial: "shared/footer_copy"

app/views/users/profil/show.html.haml

@@ -74,3 +74,6 @@
               method: :delete,
               data: { confirm: t('.unlink_confirmation', full_name: fci.full_name) },
               class: 'fr-btn fr-btn--secondary fr-ml-2w'
+
+- content_for :footer do
+  = render partial: 'users/dossiers/index_footer'

config/locales/links.en.yml

@@ -1,9 +1,7 @@
 en:
   links:
     provider:
-      provided_by: "la DINUM"
+      provided_by: "The DINUM"
-      title: "Direction Interministérielle au Numérique"
-      url: "https://numerique.gouv.fr"
     common:
       faq:
         label: "FAQ"
@@ -36,9 +34,10 @@ en:
         label: "API Documentation"
         title: "API Documentation"
         url: "https://doc.demarches-simplifiees.fr/pour-aller-plus-loin/graphql"
-      betagouv:
+      dinum:
-        title: "The Beta.gouv.fr website — First Minister"
+        title: "The DINUM website - Government"
-        url: "https://beta.gouv.fr"
+        url: "https://www.numerique.gouv.fr/dinum/"
+        alt: "Interministerial Directorate for Digital Affairs"
       code:
         label: "Source code"
         title: "Our Source code is open source"

config/locales/links.fr.yml

@@ -36,9 +36,10 @@ fr:
         label: "Documentation de l’API"
         title: "Documentation graphql de l’API"
         url: "https://doc.demarches-simplifiees.fr/pour-aller-plus-loin/graphql"
-      betagouv:
+      dinum:
-        title: "Le site de beta.gouv.fr — Premier Ministre"
+        title: "Le site de la DINUM — Gouvernement"
-        url: "https://beta.gouv.fr"
+        url: "https://www.numerique.gouv.fr/dinum/"
+        alt: "Direction interministérielle du numérique"
       cgu:
         label: "CGU"
         title: "Conditions Générales d’Utilisation"
@@ -83,5 +84,5 @@ fr:
         label: Gestion des cookies
         title: Gestion des cookies
       contact:
-        label: Contactez-nous
+        label: Nous contacter
-        title: Contactez-nous
+        title: Nous contacter

config/locales/views/users/procedure_footer/en.yml

@@ -2,27 +2,29 @@ en:
   users:
     procedure_footer:
       managed_by:
-        header: 'This procedure is managed by :'
+        header: 'This procedure is managed by'
       contact:
         header: 'Ask a question about the procedure :'
         in_app_mail:
           link: "Direclty via the chat"
         email:
-          link: "Directly by email %{service_email}"
+          link: "Directly by email:"
         phone:
-          link: 'By phone %{service_telephone}'
+          link: 'By phone: %{service_telephone}'
         schedule:
           prefix: 'Hours : '
         stats:
           link: "See the procedure's stats"
       legals:
-        header: "Legals :"
+        header: "Legals"
         data_retention: "%{application_name} : %{duree_conservation_dossiers_dans_ds} months"
         data_retention_title: "Explanation of our data retention and archiving policy"
         terms: "Laws regarding this data collection"
         dpo: "Contact the Data Protection Officer"
       dematerialisation: 
         header: Paperless
-        title_1: Access to the printable PDF form
+        title_1: Download the PDF form
-        title_2: Find a “France Services” desk
         link: "https://www.transformation.gouv.fr/france-services"
+        alt: France services
+      support:
+        header: Being supported in your approach

config/locales/views/users/procedure_footer/fr.yml

@@ -4,11 +4,11 @@ fr:
       managed_by:
         header: 'Cette démarche est gérée par'
       contact:
-        header: 'Une question sur la démarche'
+        header: 'Poser une question sur la démarche'
         in_app_mail:
           link: "Directement par la messagerie"
         email:
-          link: "Directement par courriel : %{service_email}"
+          link: "Directement par courriel :"
         phone:
           link: 'Par téléphone au %{service_telephone}'
         schedule:
@@ -37,6 +37,9 @@ fr:
           url: "https://data.gouv.fr"
       dematerialisation: 
         header: Dématérialisation
-        title_1: Accès au formulaire PDF à imprimer
+        title_1: Télécharger le formulaire PDF
         title_2: Trouver une maison France Services
         link: "https://www.transformation.gouv.fr/france-services"
+        alt: France services
+      support:
+        header: Être accompagné dans votre démarche