From aeffd19abd3b7197eeb2a7560aa9e1466fa1833b Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Thu, 14 Nov 2024 17:23:30 +0100 Subject: [PATCH] chore(footer): add digital inclusion sites --- app/assets/images/footer/logo-france-services.svg | 1 - app/views/administrateurs/labels/index.html.haml | 2 +- app/views/users/_procedure_footer.html.haml | 11 ++++++++--- config/locales/views/users/procedure_footer/en.yml | 9 +++++++-- config/locales/views/users/procedure_footer/fr.yml | 10 +++++++--- 5 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 app/assets/images/footer/logo-france-services.svg diff --git a/app/assets/images/footer/logo-france-services.svg b/app/assets/images/footer/logo-france-services.svg deleted file mode 100644 index 7f3a64671..000000000 --- a/app/assets/images/footer/logo-france-services.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/views/administrateurs/labels/index.html.haml b/app/views/administrateurs/labels/index.html.haml index f0dc512f5..f6ea78c76 100644 --- a/app/views/administrateurs/labels/index.html.haml +++ b/app/views/administrateurs/labels/index.html.haml @@ -13,7 +13,7 @@ class: "fr-btn fr-btn--primary fr-btn--icon-left fr-icon-add-circle-line mb-3" - if @procedure.labels.present? - .fr-table.fr-table--layout-fixed.fr-table--bordered + .fr-table.fr-table--layout-fixed %table %caption Liste des labels %thead diff --git a/app/views/users/_procedure_footer.html.haml b/app/views/users/_procedure_footer.html.haml index d4b149ec1..c1aa47387 100644 --- a/app/views/users/_procedure_footer.html.haml +++ b/app/views/users/_procedure_footer.html.haml @@ -37,9 +37,14 @@ .fr-download = link_to I18n.t('users.procedure_footer.dematerialisation.title_1'), commencer_dossier_vide_for_revision_path(procedure.active_revision), download: 'true', class: '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")) + %ul.fr-footer__top-list + %li + = link_to I18n.t('users.procedure_footer.support_links.france_service.title'), t("users.procedure_footer.support_links.france_service.url"), + title: new_tab_suffix(t("users.procedure_footer.support_links.france_service.title")), class: "fr-footer__link", **external_link_attributes + + %li + = link_to I18n.t('users.procedure_footer.support_links.carte_inclusion.title'), t("users.procedure_footer.support_links.carte_inclusion.url"), + title: new_tab_suffix(t("users.procedure_footer.support_links.carte_inclusion.title")), class: "fr-footer__link", **external_link_attributes .fr-footer__bottom.fr-mt-0 .fr-container diff --git a/config/locales/views/users/procedure_footer/en.yml b/config/locales/views/users/procedure_footer/en.yml index 102b8a5f0..da21953ed 100644 --- a/config/locales/views/users/procedure_footer/en.yml +++ b/config/locales/views/users/procedure_footer/en.yml @@ -23,7 +23,12 @@ en: dematerialisation: header: Paperless title_1: Download the PDF form - link: "https://www.transformation.gouv.fr/france-services" - alt: France services support: header: Being supported in your approach + support_links: + france_service: + title: Find a France Services house + url: 'https://www.transformation.gouv.fr/france-services' + carte_inclusion: + title: Map of digital inclusion sites + url: 'https://cartographie.societenumerique.gouv.fr/' diff --git a/config/locales/views/users/procedure_footer/fr.yml b/config/locales/views/users/procedure_footer/fr.yml index 557905380..59404d781 100644 --- a/config/locales/views/users/procedure_footer/fr.yml +++ b/config/locales/views/users/procedure_footer/fr.yml @@ -39,8 +39,12 @@ fr: dematerialisation: header: Dématérialisation 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 + support_links: + france_service: + title: Trouver une maison France Services + url: 'https://www.transformation.gouv.fr/france-services' + carte_inclusion: + title: Carte des lieux d‘inclusion numérique + url: 'https://cartographie.societenumerique.gouv.fr/'