Merge pull request #7794 from betagouv/feat/7780

ETQ Visiteur, je souhaite voir le footer de la home au DSFR

app/views/root/_footer.html.haml

@@ -1,50 +1,69 @@
-%footer.landing-footer{ role: 'contentinfo' }
+%footer.fr-footer#footer{ role: "contentinfo" }
-  .container
+  .fr-footer__top
-    %nav{ 'aria-label': t('links.footer.nav_aria', application_name: APPLICATION_NAME) }
+    .fr-container
-      %ul.footer-columns
+      .fr-grid-row.fr-grid-row--start.fr-grid-row--gutters
-        %li.footer-column
+        .fr-col-12.fr-col-sm-3.fr-col-md-3
-          %ul.footer-logos
+          %h3.fr-footer__top-cat= t("links.footer.top_labels.communication")
-            %li.footer-text
+          %ul.fr-footer__top-list
-              Un service fourni par
+            %li.fr-footer__top-link
-              = link_to t("links.provider.provided_by"), t("links.provider.url"), title: t("links.provider.title")
+              = link_to t("links.footer.newsletter.label"), t("links.footer.newsletter.url"), title: t("links.footer.newsletter.title"), class: "fr-footer__top-link", rel: "noopener"
-              %br
+            %li.fr-footer__top-link
-            %li
+              = link_to t("links.footer.releases.label"), t("links.footer.releases.url"), title: t("links.footer.releases.title"), class: "fr-footer__top-link"
-              = link_to t("links.provider.url"), title: t("links.provider.title"), 'aria-label': t("links.provider.name") do
+        .fr-col-12.fr-col-sm-3.fr-col-md-3
-                %span.footer-logo{ role: 'img', 'aria-label': t("links.provider.logo.alt") }
+          %h3.fr-footer__top-cat= t("links.footer.top_labels.legals")
-                  = image_tag t("links.provider.logo.src"), alt: t("links.provider.logo.alt"), width: t("links.provider.logo.width"), height: t("links.provider.logo.height"), loading: 'lazy'
+          %ul.fr-footer__top-list
-              = link_to t("links.footer.betagouv.url"), title: t("links.footer.betagouv.title"), 'aria-label': t("links.footer.betagouv.label") do
+            %li.fr-footer__top-link
-                %span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': "Logo #{t('links.footer.betagouv.label')}" }
+              = link_to t("links.footer.mentions_legales.label"), t("links.footer.mentions_legales.url"), title: t("links.footer.mentions_legales.title"), class: "fr-footer__top-link", rel: "noopener noreferrer"
+            %li.fr-footer__top-link
+              = link_to t("links.footer.suivi.label"), suivi_path, title: t("links.footer.suivi.title"), class: "fr-footer__top-link"
+            %li.fr-footer__top-link
+              = link_to t("links.footer.stats.label"), stats_path, title: t("links.footer.stats.title"), class: "fr-footer__top-link"
+            %li.fr-footer__top-link
+              = link_to t("links.footer.cgu.label"), t("links.footer.cgu.url"), title: t("links.footer.cgu.title"), class: "fr-footer__top-link", rel: "noopener noreferrer"
+        .fr-col-12.fr-col-sm-3.fr-col-md-3
+          %h3.fr-footer__top-cat= t("links.footer.top_labels.resources")
+          %ul.fr-footer__top-list
+            %li.fr-footer__top-link
+              = link_to t("links.footer.doc.label"), t("links.footer.doc.url"), title: t("links.footer.doc.title"), class: "fr-footer__top-link", rel: "noopener noreferrer"
+            %li.fr-footer__top-link
+              = link_to t("links.footer.api_doc.label"), t("links.footer.api_doc.url"), title: t("links.footer.api_doc.title"), class: "fr-footer__top-link", rel: "noopener noreferrer"
+            %li.fr-footer__top-link
+              = link_to t("links.footer.faq.label"), t("links.footer.faq.url"), title: t("links.footer.faq.title"), class: "fr-footer__top-link", rel: "noopener noreferrer"
+            %li.fr-footer__top-link
+              = link_to t("links.footer.code.label"), t("links.footer.code.url"), title: t("links.footer.code.title"), class: "fr-footer__top-link", rel: "noopener noreferrer"
+        .fr-col-12.fr-col-sm-3.fr-col-md-3
+          %h3.fr-footer__top-cat= t("links.footer.top_labels.diagnostic")
+          %ul.fr-footer__top-list
+            %li.fr-footer__top-link
+              = link_to t("links.footer.status_page.label"), t("links.footer.status_page.url"), title: t("links.footer.status_page.title"), class: "fr-footer__top-link", rel: "noopener noreferrer"
+            %li.fr-footer__top-link
+              = link_to t("links.footer.security.label"), t("links.footer.security.url"), title: t("links.footer.security.title"), class: "fr-footer__top-link", rel: "noopener noreferrer"
+  .fr-container
+    .fr-footer__body
+      .fr-footer__brand.fr-enlarge-link
+        %p.fr-logo
+          premier
+          %br
+          ministre
+        = link_to t("links.footer.betagouv.url"), title: t("links.footer.betagouv.title"), 'aria-label': t("links.footer.betagouv.label"), class: "fr-footer__brand-link" do
+          %span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': "Logo #{t('links.footer.betagouv.label')}" }
+      .fr-footer__content
+        %p.fr-footer__content-desc= t('links.footer.description_1')
+        %p.fr-footer__content-desc= t('links.footer.description_2')
+        %ul.fr-footer__content-list
+          %li.fr-footer__content-item
+            = link_to t('users.procedure_footer.official_links.legifrance.title'), t('users.procedure_footer.official_links.legifrance.url'), class: 'fr-footer__content-link', target: '_blank'
+          %li.fr-footer__content-item
+            = link_to t('users.procedure_footer.official_links.gouvernement.title'), t('users.procedure_footer.official_links.gouvernement.url'), class: 'fr-footer__content-link', target: '_blank'
+          %li.fr-footer__content-item
+            = link_to t('users.procedure_footer.official_links.service_public.title'), t('users.procedure_footer.official_links.service_public.url'), class: 'fr-footer__content-link', target: '_blank'
+          %li.fr-footer__content-item
+            = link_to t('users.procedure_footer.official_links.data_gouv.title'), t('users.procedure_footer.official_links.data_gouv.url'), class: 'fr-footer__content-link', target: '_blank'
 
-        %li.footer-column
+    .fr-footer__bottom
-          %ul.footer-links
+      = render partial: 'users/general_footer_row'
-            %li.footer-link
+      .fr-footer__bottom-copy
-              = link_to t("links.footer.newsletter.label"), t("links.footer.newsletter.url"), title: t("links.footer.newsletter.title"), class: "footer-link", target: "_blank", rel: "noopener"
+        %p
-            %li.footer-link
+          Sauf mention contraire, tous les contenus de ce site sont sous
-              = link_to t("links.footer.releases.label"), t("links.footer.releases.url"), title: t("links.footer.releases.title"), class: "footer-link"
+          %a{ href: "https://github.com/etalab/licence-ouverte/blob/master/LO.md", target:"_blank" } licence etalab-2.0
-            %li.footer-link
+        %br
-              = link_to t("links.footer.stats.label"), stats_path, title: t("links.footer.stats.title"), class: "footer-link"
-            %li.footer-link
-              = link_to t("links.footer.cgu.label"), t("links.footer.cgu.url"), title: t("links.footer.cgu.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"
-            %li.footer-link
-              = link_to t("links.footer.mentions_legales.label"), t("links.footer.mentions_legales.url"), title: t("links.footer.mentions_legales.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"
-            %li.footer-link
-              = link_to t("links.footer.suivi.label"), suivi_path, title: t("links.footer.suivi.title"), class: "footer-link"
-            %li.footer-link
-              = link_to t("links.footer.code.label"), t("links.footer.code.url"), title: t("links.footer.code.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"
-
-        %li.footer-column
-          %ul.footer-links
-            %li.footer-link
-              = contact_link t("links.footer.contact.label"), title: t("links.footer.contact.title"), class: "footer-link"
-            %li.footer-link
-              = link_to t("links.footer.doc.label"), t("links.footer.doc.url"), title: t("links.footer.doc.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"
-            %li.footer-link
-              = link_to t("links.footer.api_doc.label"), t("links.footer.api_doc.url"), title: t("links.footer.api_doc.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"
-            %li.footer-link
-              = link_to t("links.footer.faq.label"), t("links.footer.faq.url"), title: t("links.footer.faq.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"
-            %li.footer-link
-              = link_to t("links.footer.accessibilite.label"), t("links.footer.accessibilite.url"), title: t("links.footer.accessibilite.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"
-            %li.footer-link
-              = link_to t("links.footer.status_page.label"), t("links.footer.status_page.url"), title: t("links.footer.status_page.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"
-            %li.footer-link
-              = link_to t("links.footer.security.label"), t("links.footer.security.url"), title: t("links.footer.security.title"), class: "footer-link", target: "_blank", rel: "noopener noreferrer"

app/views/support/index.html.haml

@@ -10,7 +10,7 @@
     = form_tag contact_path, method: :post, multipart: true, class: 'form' do
 
       .description
-        %p= t('.intro_html')
+        %h2= t('.intro_html')
         %br
         %p.mandatory-explanation= t('asterisk_html', scope: [:utils])
 

app/views/users/confirmations/new.html.haml

@@ -10,7 +10,7 @@
 
     %img.confirmation-icon{ src: image_url("user/confirmation-email.svg"), alt: "Email envoyé" }
 
-    %p.confirmation-preamble
+    %h2.confirmation-preamble
       = succeed '.' do
         Avant d’effectuer votre démarche, nous avons besoin de vérifier votre adresse
         - if resource.email.present?

config/locales/links.en.yml

@@ -1,17 +1,18 @@
 en:
   links:
     provider:
-      logo:
-        src: "footer/logo-dinum.png"
-        alt: "Logo DINUM"
-        height: 161
-        width: 138
       name: "DINUM"
       provided_by: "la DINUM"
       title: "Direction Interministérielle au Numérique"
       url: "https://numerique.gouv.fr"
     footer:
-      nav_aria: "More about %{application_name}"
+      top_labels:
+        communication: Communication
+        legals: Legal information
+        resources: Resources
+        diagnostic: Diagnostic
+      description_1: Demarches simplifiées is powered by the interdepartmental direction of digital. 
+      description_2: The source code is available under a free license.
       accessibilite:
         label: "Accessibility: partially compliant"
         title: "Accessibility declaration"
@@ -34,9 +35,6 @@ en:
         label: "ToS"
         title: "Terms of Service"
         url: "https://doc.demarches-simplifiees.fr/cgu"
-      contact:
-        label: "Contact"
-        title: "Contact us"
       doc:
         label: "Documentation"
         title: "Our Documentation"

config/locales/links.fr.yml

@@ -1,17 +1,18 @@
 fr:
   links:
     provider:
-      logo:
-        src: "footer/logo-dinum.png"
-        alt: "Logo DINUM"
-        height: 161
-        width: 138
       name: "DINUM"
       provided_by: "la DINUM"
       title: "Direction Interministérielle au Numérique"
       url: "https://numerique.gouv.fr"
     footer:
-      nav_aria: "En savoir plus sur %{application_name}"
+      top_labels:
+        communication: Communication
+        legals: Informations légales
+        resources: Ressources
+        diagnostic: Diagnostic
+      description_1: Demarches simplifiées est propulsé par la direction interministérielle du numérique. 
+      description_2: Le code source est disponible en licence libre.
       accessibilite:
         label: "Accessibilité : partiellement conforme"
         title: "Consulter notre déclaration d'accessibilité"
@@ -36,9 +37,6 @@ fr:
         label: "Code source"
         title: "Le code ouvert de demarches-simplifiees"
         url: "https://github.com/betagouv/demarches-simplifiees.fr"
-      contact:
-        label: "Contact"
-        title: "Nous contacter"
       contact_technique:
         label: "Contact technique"
         title: "Contacter notre équipe technique"