From c35a3d17de3db7055ed4d71958a4051c0fbf1eec Mon Sep 17 00:00:00 2001 From: Kara Diaby Date: Tue, 27 Sep 2022 11:48:41 +0200 Subject: [PATCH] fix dsfr footer visitor --- app/views/root/_footer.html.haml | 12 ++++++++---- config/locales/links.en.yml | 14 ++++++++------ config/locales/links.fr.yml | 15 ++++++++------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/views/root/_footer.html.haml b/app/views/root/_footer.html.haml index e28ead76c..753d76d00 100644 --- a/app/views/root/_footer.html.haml +++ b/app/views/root/_footer.html.haml @@ -5,10 +5,10 @@ .fr-col-12.fr-col-sm-3.fr-col-md-3 %h3.fr-footer__top-cat= t("links.footer.top_labels.communication") %ul.fr-footer__top-list - %li.fr-footer__top-link - = 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" %li.fr-footer__top-link = link_to t("links.footer.releases.label"), t("links.footer.releases.url"), title: t("links.footer.releases.title"), class: "fr-footer__top-link" + %li.fr-footer__top-link + = link_to t("links.footer.contact.label"), contact_path, title: t("links.footer.contact.title"), class: "fr-footer__top-link" .fr-col-12.fr-col-sm-3.fr-col-md-3 %h3.fr-footer__top-cat= t("links.footer.top_labels.legals") %ul.fr-footer__top-list @@ -48,8 +48,12 @@ = 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') + %p.fr-footer__content-desc + = t('links.footer.description_1') + = link_to t('links.footer.link_1_label'), t('links.footer.link_1_url'), target: '_blank', class: "fr-underlined" + %p.fr-footer__content-desc + = link_to t('links.footer.link_2_label'), t("links.footer.code.url"), target: '_blank', class: "fr-underlined" + = 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' diff --git a/config/locales/links.en.yml b/config/locales/links.en.yml index 173af1dce..1ca32e653 100644 --- a/config/locales/links.en.yml +++ b/config/locales/links.en.yml @@ -11,8 +11,11 @@ en: 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. + description_1: Démarches simplifiées is powered by + link_1_label: the interdepartmental direction of digital (DINUM). + link_1_url: "https://www.numerique.gouv.fr/dinum/" + link_2_label: The source code + description_2: is available under a free license. accessibilite: label: "Accessibility: partially compliant" title: "Accessibility declaration" @@ -55,10 +58,6 @@ en: label: "Legal notices" title: "Legal notices regarding our platform" url: "https://doc.demarches-simplifiees.fr/mentions-legales" - newsletter: - label: "Newsletter" - title: "Our newsletter" - url: "https://my.sendinblue.com/users/subscribe/js_id/3s2q1/id/1" releases: label: "Releases" title: "Our last updates" @@ -78,3 +77,6 @@ en: label: "Online workshop registration" title: "Registration for our online workshop" url: "https://app.livestorm.co/demarches-simplifiees" + contact: + label: Contactez-nous + title: Contactez-nous diff --git a/config/locales/links.fr.yml b/config/locales/links.fr.yml index 720e29a2b..df37328e6 100644 --- a/config/locales/links.fr.yml +++ b/config/locales/links.fr.yml @@ -11,8 +11,11 @@ fr: 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. + description_1: Démarches simplifiées est un service propulsé par + link_1_label: la direction interministérielle du numérique (DINUM). + link_1_url: "https://www.numerique.gouv.fr/dinum/" + link_2_label: Le code source + description_2: est disponible en licence libre. accessibilite: label: "Accessibilité : partiellement conforme" title: "Consulter notre déclaration d'accessibilité" @@ -60,10 +63,6 @@ fr: label: "Mentions légales" title: "Consulter nos Mentions légales" url: "https://doc.demarches-simplifiees.fr/mentions-legales" - newsletter: - label: "Infolettres" - title: "S'abonner a notre infolettre" - url: "https://my.sendinblue.com/users/subscribe/js_id/3s2q1/id/1" releases: label: "Nouveautés" title: "Les dernière mises à jour de la plateforme" @@ -93,4 +92,6 @@ fr: cookies: label: Gestion des cookies title: Gestion des cookies - + contact: + label: Contactez-nous + title: Contactez-nous