update structure, content and translations procedure footer

app/views/users/_procedure_footer.html.haml

@@ -1,12 +1,12 @@
-%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-3w
+            .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'})
@@ -17,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)}"
@@ -28,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?
@@ -53,17 +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 (t('users.procedure_footer.dematerialisation.title_1') + content_tag(:span, "Format – taille de fichier", :class => "fr-download__detail")).html_safe, 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__bottom
+    .fr-container
       = render partial: 'users/general_footer_row', locals: { dossier: dossier }
       = render partial: 'shared/footer_copy'

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

@@ -8,9 +8,9 @@ en:
         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:
@@ -23,6 +23,9 @@ en:
         dpo: "Contact the Data Protection Officer"
       dematerialisation: 
         header: Paperless
-        title_1: Access to the printable PDF form
+        title_1: Download the 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

@@ -8,7 +8,7 @@ fr:
         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:
@@ -40,3 +40,6 @@ fr:
         title_1: Télécharger le formulaire
         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