DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10537 from demarches-simplifiees/a11y-fix-titles

Browse source 
Pied de page - correction des titres de liens
This commit is contained in:
mfo 2024-06-22 04:07:43 +00:00 committed by GitHub
commit 9b63543afa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 49 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/application/_general_footer_row.html.haml
View file

@ -8,11 +8,11 @@
%li.fr-footer__bottom-item %li.fr-footer__bottom-item
= link_to t("links.footer.vote_feature.label"), FEATURE_UPVOTE_URL, title: t("links.footer.vote_feature.title"), class: "fr-footer__bottom-link", target: "_blank", rel: "noopener noreferrer" = link_to t("links.footer.vote_feature.label"), FEATURE_UPVOTE_URL, title: t("links.footer.vote_feature.title"), class: "fr-footer__bottom-link", target: "_blank", rel: "noopener noreferrer"
%li.fr-footer__bottom-item %li.fr-footer__bottom-item
= link_to t("links.footer.accessibilite.label"), ACCESSIBILITE_URL, title: t("links.footer.accessibilite.title"), class: "fr-footer__bottom-link", rel: "noopener noreferrer" = link_to t("links.footer.accessibilite.label"), ACCESSIBILITE_URL, class: "fr-footer__bottom-link", rel: "noopener noreferrer"
%li.fr-footer__bottom-item %li.fr-footer__bottom-item
= link_to t("links.footer.mentions_legales.label"), MENTIONS_LEGALES_URL, title: t("links.footer.mentions_legales.title"), class: "fr-footer__bottom-link", rel: "noopener noreferrer" = link_to t("links.footer.mentions_legales.label"), MENTIONS_LEGALES_URL, class: "fr-footer__bottom-link", rel: "noopener noreferrer"
%li.fr-footer__bottom-item %li.fr-footer__bottom-item
= link_to t("links.footer.cookies.label"), suivi_path, title: t("links.footer.cookies.title"), class: "fr-footer__bottom-link" = link_to t("links.footer.cookies.label"), suivi_path, class: "fr-footer__bottom-link", hreflang: "fr"
%li.fr-footer__bottom-item %li.fr-footer__bottom-item
%button.fr-footer__bottom-link.fr-icon-theme-fill.fr-btn--icon-left{ aria: {controls: "fr-theme-modal" }, data: {'fr-opened': "false" } } %button.fr-footer__bottom-link.fr-icon-theme-fill.fr-btn--icon-left{ aria: {controls: "fr-theme-modal" }, data: {'fr-opened': "false" } }
= t('links.footer.display_params') = t('links.footer.display_params')

60
app/views/root/_footer.html.haml
View file

@ -6,54 +6,58 @@
.fr-col-12.fr-col-sm-3.fr-col-md-3 .fr-col-12.fr-col-sm-3.fr-col-md-3
%h3.fr-footer__top-cat= t("links.footer.top_labels.communication") %h3.fr-footer__top-cat= t("links.footer.top_labels.communication")
%ul.fr-footer__top-list %ul.fr-footer__top-list
%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.footer.releases.label"), t("links.footer.releases.url"), title: t("links.footer.releases.title"), class: "fr-footer__top-link", hreflang: "fr"
%li.fr-footer__top-link %li
= link_to t("links.footer.contact.label"), contact_path, title: t("links.footer.contact.title"), class: "fr-footer__top-link" = link_to t("links.footer.contact.label"), contact_path, class: "fr-footer__top-link"
.fr-col-12.fr-col-sm-3.fr-col-md-3 .fr-col-12.fr-col-sm-3.fr-col-md-3
%h3.fr-footer__top-cat= t("links.footer.top_labels.legals") %h3.fr-footer__top-cat= t("links.footer.top_labels.legals")
%ul.fr-footer__top-list %ul.fr-footer__top-list
%li.fr-footer__top-link %li
= link_to t("links.footer.mentions_legales.label"), MENTIONS_LEGALES_URL, title: t("links.footer.mentions_legales.title"), class: "fr-footer__top-link", rel: "noopener noreferrer" = link_to t("links.footer.mentions_legales.label"), MENTIONS_LEGALES_URL, class: "fr-footer__top-link", rel: "noopener noreferrer"
%li.fr-footer__top-link %li
= link_to t("links.footer.suivi.label"), suivi_path, title: t("links.footer.suivi.title"), class: "fr-footer__top-link" = link_to t("links.footer.suivi.label"), suivi_path, class: "fr-footer__top-link", hreflang: "fr"
%li.fr-footer__top-link %li
= link_to t("links.footer.stats.label"), stats_path, title: t("links.footer.stats.title"), class: "fr-footer__top-link" = link_to t("links.footer.stats.label"), stats_path, class: "fr-footer__top-link", hreflang: "fr"
%li.fr-footer__top_link %li
= link_to t("links.footer.carte.label"), carte_path, title: t("links.footer.carte.title"), class: "fr-footer__top-link" = link_to t("links.footer.carte.label"), carte_path, title: t("links.footer.carte.title"), class: "fr-footer__top-link"
%li.fr-footer__top-link %li
= 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" %a.fr-footer__top-link{ :href => t("links.footer.cgu.url"), :rel => "noopener noreferrer", :hreflang => "fr" }
%abbr{ title: t("links.footer.cgu.title") }
= t("links.footer.cgu.label")
.fr-col-12.fr-col-sm-3.fr-col-md-3 .fr-col-12.fr-col-sm-3.fr-col-md-3
%h3.fr-footer__top-cat= t("links.footer.top_labels.resources") %h3.fr-footer__top-cat= t("links.footer.top_labels.resources")
%ul.fr-footer__top-list %ul.fr-footer__top-list
%li.fr-footer__top-link %li
= 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" = 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", hreflang: "fr"
%li.fr-footer__top-link %li
= 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" = 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", hreflang: "fr"
%li.fr-footer__top-link %li
= link_to t("links.common.faq.label"), t("links.common.faq.url"), title: t("links.common.faq.title"), class: "fr-footer__top-link", rel: "noopener noreferrer" %a.fr-footer__top-link{ :href => t("links.common.faq.url"), :rel => "noopener noreferrer" }
%li.fr-footer__top-link %abbr{ title: t("links.common.faq.title") }
= 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" = t("links.common.faq.label")
%li
= link_to t("links.footer.code.label"), t("links.footer.code.url"), class: "fr-footer__top-link", rel: "noopener noreferrer", hreflang: "fr"
.fr-col-12.fr-col-sm-3.fr-col-md-3 .fr-col-12.fr-col-sm-3.fr-col-md-3
%h3.fr-footer__top-cat= t("links.footer.top_labels.diagnostic") %h3.fr-footer__top-cat= t("links.footer.top_labels.diagnostic")
%ul.fr-footer__top-list %ul.fr-footer__top-list
%li.fr-footer__top-link %li
= 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" = 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", hreflang: "fr"
%li.fr-footer__top-link %li
= 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" = 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", hreflang: "fr"
.fr-container .fr-container
.fr-footer__body .fr-footer__body
.fr-footer__brand.fr-enlarge-link{ lang: "fr" } .fr-footer__brand.fr-enlarge-link{ lang: "fr" }
%p.fr-logo %p.fr-logo
gouvernement gouvernement
= link_to t("links.footer.dinum.url"), title: t("links.footer.dinum.title"), class: "fr-footer__brand-link" do = link_to t("links.footer.dinum.url"), title: t("links.footer.dinum.title"), hreflang:'fr', 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")) = image_tag("footer/logo-dinum.svg", class: "fr-footer__logo logo-beta-gouv-fr", alt: t("links.footer.dinum.alt"))
.fr-footer__content .fr-footer__content
%p.fr-footer__content-desc %p.fr-footer__content-desc
= t('links.footer.description_1') = t('links.footer.description_1')
= link_to(t('links.footer.link_1_label'), t('links.footer.link_1_url'), title: new_tab_suffix(t('links.footer.link_1_label')), **external_link_attributes) + "." = link_to(t('links.footer.link_1_label'), t('links.footer.link_1_url'), title: new_tab_suffix(t('links.footer.link_1_label')), hreflang:'fr', **external_link_attributes) + "."
%p.fr-footer__content-desc %p.fr-footer__content-desc
= link_to t('links.footer.link_2_label'), t("links.footer.code.url"), title: new_tab_suffix(t('links.footer.link_2_label')), **external_link_attributes = link_to t('links.footer.link_2_label'), t("links.footer.code.url"), title: new_tab_suffix(t('links.footer.link_2_label')), hreflang:'fr', **external_link_attributes
= t('links.footer.description_2') = t('links.footer.description_2')
= render partial: "shared/footer_content_list" = render partial: "shared/footer_content_list"

8
app/views/shared/_footer_content_list.html.haml
View file

@ -1,9 +1,9 @@
%ul.fr-footer__content-list %ul.fr-footer__content-list
%li.fr-footer__content-item %li.fr-footer__content-item
= link_to t('users.procedure_footer.official_links.legifrance.title'), t('users.procedure_footer.official_links.legifrance.url'), title: new_tab_suffix(t('users.procedure_footer.official_links.legifrance.title')), class: 'fr-footer__content-link', **external_link_attributes = link_to t('users.procedure_footer.official_links.legifrance.title'), t('users.procedure_footer.official_links.legifrance.url'), title: new_tab_suffix(t('users.procedure_footer.official_links.legifrance.title')), class: 'fr-footer__content-link', hreflang: 'fr', **external_link_attributes
%li.fr-footer__content-item %li.fr-footer__content-item
= link_to t('users.procedure_footer.official_links.gouvernement.title'), t('users.procedure_footer.official_links.gouvernement.url'), title: new_tab_suffix(t('users.procedure_footer.official_links.gouvernement.title')), class: 'fr-footer__content-link', **external_link_attributes = link_to t('users.procedure_footer.official_links.gouvernement.title'), t('users.procedure_footer.official_links.gouvernement.url'), title: new_tab_suffix(t('users.procedure_footer.official_links.gouvernement.title')), class: 'fr-footer__content-link', hreflang:'fr', **external_link_attributes
%li.fr-footer__content-item %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'), title: new_tab_suffix(t('users.procedure_footer.official_links.service_public.title')), class: 'fr-footer__content-link', **external_link_attributes = link_to t('users.procedure_footer.official_links.service_public.title'), t('users.procedure_footer.official_links.service_public.url'), title: new_tab_suffix(t('users.procedure_footer.official_links.service_public.title')), class: 'fr-footer__content-link', hreflang:'fr', **external_link_attributes
%li.fr-footer__content-item %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'), title: new_tab_suffix(t('users.procedure_footer.official_links.data_gouv.title')), class: 'fr-footer__content-link', **external_link_attributes = link_to t('users.procedure_footer.official_links.data_gouv.title'), t('users.procedure_footer.official_links.data_gouv.url'), title: new_tab_suffix(t('users.procedure_footer.official_links.data_gouv.title')), class: 'fr-footer__content-link', hreflang:'fr', **external_link_attributes

2
app/views/shared/_footer_copy.html.haml
View file

@ -1,2 +1,2 @@
.fr-footer__bottom-copy .fr-footer__bottom-copy
%p= t("links.footer.copy_html", link: link_to(t("links.footer.license"), "https://github.com/etalab/licence-ouverte/blob/master/LO.md", title: new_tab_suffix("licence etalab-2.0"), **external_link_attributes)) %p= t("links.footer.copy_html", link: link_to(t("links.footer.license"), "https://github.com/etalab/licence-ouverte/blob/master/LO.md", title: new_tab_suffix(t("links.footer.license")), hreflang: "fr", **external_link_attributes))

16
config/locales/links.en.yml
View file

@ -29,10 +29,9 @@ en:
license: "licensed under etalab 2.0" license: "licensed under etalab 2.0"
accessibilite: accessibilite:
label: "Accessibility: partially compliant" label: "Accessibility: partially compliant"
title: "Accessibility declaration"
api_doc: api_doc:
label: "API Documentation" label: "API Documentation"
title: "API Documentation" title: "Graphql API Documentation"
url: "https://doc.demarches-simplifiees.fr/api-graphql" url: "https://doc.demarches-simplifiees.fr/api-graphql"
dinum: dinum:
title: "Le site de la DINUM — Direction interministérielle du numérique" title: "Le site de la DINUM — Direction interministérielle du numérique"
@ -40,7 +39,6 @@ en:
alt: "Direction interministérielle du numérique" alt: "Direction interministérielle du numérique"
code: code:
label: "Source code" label: "Source code"
title: "Our Source code is open source"
url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr" url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr"
cgu: cgu:
label: "ToS" label: "ToS"
@ -48,36 +46,32 @@ en:
url: "https://doc.demarches-simplifiees.fr/cgu" url: "https://doc.demarches-simplifiees.fr/cgu"
doc: doc:
label: "Documentation" label: "Documentation"
title: "Our Documentation" title: "User Documentation"
url: "https://doc.demarches-simplifiees.fr" url: "https://doc.demarches-simplifiees.fr"
vote_feature: vote_feature:
label: "Improve the site" label: "Improve the site"
title: "Vote for your priority improvements or share your own ideas" title: "Vote for your priority improvements or share your own ideas"
mentions_legales: mentions_legales:
label: "Legal notices" label: "Legal notices"
title: "Legal notices regarding our platform"
releases: releases:
label: "Releases notes" label: "Releases notes"
title: "Our last updates" title: "Releases notes: Our last updates"
url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr/releases" url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr/releases"
security: security:
label: "Security" label: "Security"
title: "Security policy" title: "Security policy and procedures"
url: "https://github.com/betagouv/demarches-simplifiees.fr/blob/main/SECURITY.md" url: "https://github.com/betagouv/demarches-simplifiees.fr/blob/main/SECURITY.md"
carte: carte:
label: "Deployment map" label: "Deployment map"
title: "Deployment map by department" title: "Deployment map by department"
status_page: status_page:
label: "Disponibility" label: "Disponibility"
title: "Disponibility and availability" title: "Disponibility and availability statistics"
url: "https://status.demarches-simplifiees.fr" url: "https://status.demarches-simplifiees.fr"
suivi: suivi:
label: "Audience tracking and privacy" label: "Audience tracking and privacy"
title: "Tracking and privacy of demarches-simplifiees"
cookies: cookies:
label: Cookies label: Cookies
title: Cookies
contact: contact:
label: Contact label: Contact
title: Contact
display_params: Display params display_params: Display params

15
config/locales/links.fr.yml
View file

@ -31,10 +31,9 @@ fr:
license: "licence etalab 2.0" license: "licence etalab 2.0"
accessibilite: accessibilite:
label: "Accessibilité : partiellement conforme" label: "Accessibilité : partiellement conforme"
title: "Consulter notre déclaration d’accessibilité"
api_doc: api_doc:
label: "Documentation de l’API" label: "Documentation de l’API"
title: "Documentation graphql de l’API" title: "Documentation de l’API au format graphql"
url: "https://doc.demarches-simplifiees.fr/api-graphql" url: "https://doc.demarches-simplifiees.fr/api-graphql"
dinum: dinum:
title: "Le site de la DINUM — Direction interministérielle du numérique" title: "Le site de la DINUM — Direction interministérielle du numérique"
@ -46,7 +45,6 @@ fr:
url: "https://doc.demarches-simplifiees.fr/cgu" url: "https://doc.demarches-simplifiees.fr/cgu"
code: code:
label: "Code source" label: "Code source"
title: "Le code ouvert de demarches-simplifiees"
url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr" url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr"
contact_technique: contact_technique:
label: "Contact technique" label: "Contact technique"
@ -60,36 +58,31 @@ fr:
title: "Votez pour vos améliorations prioritaires ou proposez votre propre idée" title: "Votez pour vos améliorations prioritaires ou proposez votre propre idée"
mentions_legales: mentions_legales:
label: "Mentions légales" label: "Mentions légales"
title: "Consulter nos Mentions légales"
releases: releases:
label: "Nouveautés" label: "Nouveautés"
title: "Les dernière mises à jour de la plateforme" title: "Nouveautés : Les dernière mises à jour de la plateforme"
url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr/releases" url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr/releases"
security: security:
label: "Sécurité" label: "Sécurité"
title: "Vous avez identifié une faille, comment nous en informer" title: "Politique et procédure de sécurité"
url: "https://github.com/betagouv/demarches-simplifiees.fr/blob/main/SECURITY.md" url: "https://github.com/betagouv/demarches-simplifiees.fr/blob/main/SECURITY.md"
stats: stats:
label: "Statistiques" label: "Statistiques"
title: "Statistiques d’usage"
carte: carte:
label: "Carte de déploiement" label: "Carte de déploiement"
title: "Carte de déploiement par département" title: "Carte de déploiement par département"
status_page: status_page:
label: "Disponibilité" label: "Disponibilité"
title: "Disponibilité du site demarches-simplifiees" title: "Statistiques de disponibilité du site demarches-simplifiees"
url: "https://status.demarches-simplifiees.fr" url: "https://status.demarches-simplifiees.fr"
suivi: suivi:
label: "Suivi d’audience et vie privée" label: "Suivi d’audience et vie privée"
title: "Consulter notre politique de respect de la vie privée"
solidarite_numerique: solidarite_numerique:
label: "Besoin d’aide avec vos démarches en ligne ?" label: "Besoin d’aide avec vos démarches en ligne ?"
title: "Avez-vous besoin d’aide concernant vos démarchez informatisées, essayez solidarite-numerique.fr" title: "Avez-vous besoin d’aide concernant vos démarchez informatisées, essayez solidarite-numerique.fr"
url: "https://www.solidarite-numerique.fr/cartographie/" url: "https://www.solidarite-numerique.fr/cartographie/"
cookies: cookies:
label: Gestion des cookies label: Gestion des cookies
title: Gestion des cookies
contact: contact:
label: Nous contacter label: Nous contacter
title: Nous contacter
display_params: Paramètres d'affichage display_params: Paramètres d'affichage