diff --git a/app/assets/images/footer/logo-beta-gouv-fr.svg b/app/assets/images/footer/logo-beta-gouv-fr.svg deleted file mode 100644 index 9066bf73d..000000000 --- a/app/assets/images/footer/logo-beta-gouv-fr.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/footer/logo-dinum.svg b/app/assets/images/footer/logo-dinum.svg new file mode 100644 index 000000000..4f179d0ca --- /dev/null +++ b/app/assets/images/footer/logo-dinum.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/footer/logo-france-services.svg b/app/assets/images/footer/logo-france-services.svg new file mode 100644 index 000000000..7f3a64671 --- /dev/null +++ b/app/assets/images/footer/logo-france-services.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/views/layouts/procedure_context.html.haml b/app/views/layouts/procedure_context.html.haml index 4c2874c34..3143c57d7 100644 --- a/app/views/layouts/procedure_context.html.haml +++ b/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' diff --git a/app/views/root/_footer.html.haml b/app/views/root/_footer.html.haml index ca916b027..6670a1323 100644 --- a/app/views/root/_footer.html.haml +++ b/app/views/root/_footer.html.haml @@ -42,11 +42,9 @@ .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"), 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") + gouvernement + = link_to t("links.footer.dinum.url"), title: t("links.footer.dinum.title"), class: "fr-footer__brand-link" do + = image_tag("footer/logo-dinum.svg", class: "fr-footer__logo logo-beta-gouv-fr", alt: t("links.footer.dinum.alt")) .fr-footer__content %p.fr-footer__content-desc = t('links.footer.description_1') diff --git a/app/views/users/_procedure_footer.html.haml b/app/views/users/_procedure_footer.html.haml index 68da85e10..0ac5c0417 100644 --- a/app/views/users/_procedure_footer.html.haml +++ b/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 - %li - = link_to t('users.procedure_footer.dematerialisation.title_1'), commencer_dossier_vide_for_revision_path(procedure.active_revision), class: 'fr-footer__top-link' - %li - = 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-download + %p + = 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' + %h3.fr-footer__top-cat= I18n.t('users.procedure_footer.support.header') + .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__body - .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 + .fr-footer__bottom.fr-mt-0 + .fr-container = render partial: 'users/general_footer_row', locals: { dossier: dossier } = render partial: 'shared/footer_copy' diff --git a/app/views/users/dossiers/_index_footer.html.haml b/app/views/users/dossiers/_index_footer.html.haml index 16f9f1273..7f9644a2d 100644 --- a/app/views/users/dossiers/_index_footer.html.haml +++ b/app/views/users/dossiers/_index_footer.html.haml @@ -1,3 +1,4 @@ -%footer.procedure-footer - .container +%footer.procedure-footer.fr-footer__bottom{ role: "contentinfo" } + .fr-container = render partial: "users/general_footer_row", locals: { dossier: nil } + = render partial: "shared/footer_copy" diff --git a/app/views/users/profil/show.html.haml b/app/views/users/profil/show.html.haml index 0f41d01c5..e8fe3b32a 100644 --- a/app/views/users/profil/show.html.haml +++ b/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' diff --git a/config/locales/links.en.yml b/config/locales/links.en.yml index 93e8eb0ac..a1aeddd58 100644 --- a/config/locales/links.en.yml +++ b/config/locales/links.en.yml @@ -1,9 +1,7 @@ en: links: provider: - provided_by: "la DINUM" - title: "Direction Interministérielle au Numérique" - url: "https://numerique.gouv.fr" + provided_by: "The DINUM" 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: - title: "The Beta.gouv.fr website — First Minister" - url: "https://beta.gouv.fr" + dinum: + title: "The DINUM website - Government" + url: "https://www.numerique.gouv.fr/dinum/" + alt: "Interministerial Directorate for Digital Affairs" code: label: "Source code" title: "Our Source code is open source" diff --git a/config/locales/links.fr.yml b/config/locales/links.fr.yml index a6c68d929..59fe2d391 100644 --- a/config/locales/links.fr.yml +++ b/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: - title: "Le site de beta.gouv.fr — Premier Ministre" - url: "https://beta.gouv.fr" + dinum: + title: "Le site de la DINUM — Gouvernement" + 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 - title: Contactez-nous + label: Nous contacter + title: Nous contacter diff --git a/config/locales/views/users/procedure_footer/en.yml b/config/locales/views/users/procedure_footer/en.yml index 31c22ff1d..4d1632cca 100644 --- a/config/locales/views/users/procedure_footer/en.yml +++ b/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_2: Find a “France Services” desk + title_1: Download the PDF form link: "https://www.transformation.gouv.fr/france-services" + alt: France services + support: + header: Being supported in your approach diff --git a/config/locales/views/users/procedure_footer/fr.yml b/config/locales/views/users/procedure_footer/fr.yml index fd61794d4..55b297565 100644 --- a/config/locales/views/users/procedure_footer/fr.yml +++ b/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