diff --git a/app/controllers/accessibility_statement_controller.rb b/app/controllers/accessibility_statement_controller.rb deleted file mode 100644 index 6a04b4e3f..000000000 --- a/app/controllers/accessibility_statement_controller.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AccessibilityStatementController < ApplicationController - def index - end -end diff --git a/app/views/static_pages/accessibility_statement.html.haml b/app/views/static_pages/accessibility_statement.html.haml index f56dcaa63..647fa57cb 100644 --- a/app/views/static_pages/accessibility_statement.html.haml +++ b/app/views/static_pages/accessibility_statement.html.haml @@ -3,37 +3,136 @@ = render partial: "root/footer" #accessibility-statement.fr-pt-2w - .fr-container - %h1.fr-mb-4w - = t('views.accessibility_statement.title') - %p.fr-mb-2w= t('views.accessibility_statement.intro') + .fr-container.fr-my-4w + .fr-grid-row + .fr-col-xl-2 + .fr-col-xl-8 + %h1.fr-mb-4w + = t('views.accessibility_statement.title') + %p.fr-mb-2w= t('views.accessibility_statement.line_one') + %p.fr-mb-2w= t('views.accessibility_statement.line_two') + " (" +ENV["APP_HOST"]+ ")." - .accessibility-block - %h2 - = t('views.accessibility_statement.compliance') - %p.fr-mb-2w= t('views.legal_notice.editing_content.line_one') + %div + %h2 + = t('views.accessibility_statement.compliance.title') + %p.fr-mb-2w= t('views.accessibility_statement.compliance.line_one_html') - .accessibility-block - %h2 - = t('views.accessibility_statement.results') - %p.fr-mb-2w= t('views.legal_notice.direction_content') + %h3 + = t('views.accessibility_statement.results.title') + %p.fr-mb-2w= t('views.accessibility_statement.results.line_one') + %p.fr-mb-2w= t('views.accessibility_statement.results.line_three') + %p.fr-mb-2w + = link_to t("views.accessibility_statement.results.programme.label"), t("views.accessibility_statement.results.programme.url"), title: t("views.accessibility_statement.results.programme.title"), target: "_blank", rel: "noopener noreferrer" - .accessibility-block - %h2 - = t('views.accessibility_statement.no_accessible') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_one') + %div + %h2 + = t('views.accessibility_statement.no_accessible.title') + %h3 + = t('views.accessibility_statement.no_accessible.subtitle_one') + .fr-mb-2w + = t('views.accessibility_statement.no_accessible.examples_html') - .accessibility-block - %h2 - = t('views.accessibility_statement.preparation') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_one') + %div + %h2 + = t('views.accessibility_statement.preparation.title') + %p.fr-mb-2w= t('views.accessibility_statement.preparation.intro') + %h3 + = t('views.accessibility_statement.preparation.subtitle_one') + %ul.fr-mb-2w + %li + = link_to t("views.accessibility_statement.preparation.techno_ruby.label"), t("views.accessibility_statement.preparation.techno_ruby.url"), title: t("views.accessibility_statement.preparation.techno_ruby.title"), target: "_blank", rel: "noopener noreferrer" + %li + = "HTML 5" + %li + = "CSS 3" + %li + = "Javascript" + %li + = "PDF" + %h3 + = t('views.accessibility_statement.preparation.subtitle_two') + %p.fr-mb-2w= t('views.accessibility_statement.preparation.environment_intro') + %ul.fr-mb-2w + %li + = t('views.accessibility_statement.preparation.environment_one') + %li + = t('views.accessibility_statement.preparation.environment_two') + %li + = t('views.accessibility_statement.preparation.environment_three') + %h3 + = t('views.accessibility_statement.preparation.subtitle_three') + %ul.fr-mb-2w + %li + = t('views.accessibility_statement.preparation.tool_one') + %li + = t('views.accessibility_statement.preparation.tool_two') + %li + = t('views.accessibility_statement.preparation.tool_three') + %li + = t('views.accessibility_statement.preparation.tool_four') + %li + = t('views.accessibility_statement.preparation.tool_five') + %li + = t('views.accessibility_statement.preparation.tool_six') + %h3 + = t('views.accessibility_statement.preparation.subtitle_four') + %ul.fr-mb-2w + %li + = link_to t("views.accessibility_statement.preparation.page_one.label"), root_path + %li + = link_to t("views.accessibility_statement.preparation.page_two.label"), contact_path + %li + = link_to t("views.accessibility_statement.preparation.page_three.label"), MENTIONS_LEGALES_URL + %li + = link_to t("views.accessibility_statement.preparation.page_four.label"), ACCESSIBILITE_URL + %li + = link_to t("views.accessibility_statement.preparation.page_five.label"), new_user_session_path + %li + = t("views.accessibility_statement.preparation.page_six") + %li + = link_to t("views.accessibility_statement.preparation.page_seven.label"), t("views.accessibility_statement.preparation.page_seven.url"), title: t("views.accessibility_statement.preparation.page_seven.title"), target: "_blank", rel: "noopener noreferrer" + %li + = link_to t("views.accessibility_statement.preparation.page_eight.label"), t("views.accessibility_statement.preparation.page_eight.url"), title: t("views.accessibility_statement.preparation.page_eight.title"), target: "_blank", rel: "noopener noreferrer" + %li + = t("views.accessibility_statement.preparation.page_nine") + %li + = t("views.accessibility_statement.preparation.page_ten") + %li + = t("views.accessibility_statement.preparation.page_eleven") + %li + = t("views.accessibility_statement.preparation.page_twelve") + %li + = t("views.accessibility_statement.preparation.page_thirteen") + %li + = t("views.accessibility_statement.preparation.page_fourteen") + %li + = t("views.accessibility_statement.preparation.page_fifteen") + %li + = t("views.accessibility_statement.preparation.page_sixteen") - .accessibility-block - %h2 - = t('views.accessibility_statement.contact') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_one') + %div + %h2 + = t('views.accessibility_statement.contact.title') + %p.fr-mb-2w= t('views.accessibility_statement.contact.intro') + %ul.fr-mb-2w + %li + = t('views.accessibility_statement.contact.infos.email_html') + = mail_to CONTACT_EMAIL + %li + = t('views.accessibility_statement.contact.infos.phone_html') + = phone_to CONTACT_PHONE.gsub(" "), CONTACT_PHONE + %li + = t('views.accessibility_statement.contact.infos.adress_html') - .accessibility-block - %h2 - = t('views.accessibility_statement.remedies') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_one') + %div + %h2 + = t('views.accessibility_statement.remedies.title') + %p.fr-mb-2w= t('views.accessibility_statement.remedies.line_one') + %p.fr-mb-2w= t('views.accessibility_statement.remedies.line_two') + %ul.fr-mb-2w + %li + = link_to t("views.accessibility_statement.remedies.remedies_one.label"), t("views.accessibility_statement.remedies.remedies_one.url"), title: t("views.accessibility_statement.remedies.remedies_one.title"), target: "_blank", rel: "noopener noreferrer" + %li + = link_to t("views.accessibility_statement.remedies.remedies_two.label"), t("views.accessibility_statement.remedies.remedies_two.url"), title: t("views.accessibility_statement.remedies.remedies_two.title"), target: "_blank", rel: "noopener noreferrer" + %li + = t('views.accessibility_statement.remedies.remedies_three') diff --git a/app/views/users/_general_footer_row.html.haml b/app/views/users/_general_footer_row.html.haml index f7f3c2eef..abe772670 100644 --- a/app/views/users/_general_footer_row.html.haml +++ b/app/views/users/_general_footer_row.html.haml @@ -1,6 +1,6 @@ %ul.fr-footer__bottom-list %li.fr-footer__bottom-item - = link_to t("links.footer.accessibilite.label"), t("links.footer.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, title: t("links.footer.accessibilite.title"), class: "fr-footer__bottom-link", rel: "noopener noreferrer" %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" %li.fr-footer__bottom-item diff --git a/config/initializers/02_urls.rb b/config/initializers/02_urls.rb index 029db3863..ec8c5e2e7 100644 --- a/config/initializers/02_urls.rb +++ b/config/initializers/02_urls.rb @@ -30,7 +30,7 @@ CADRE_JURIDIQUE_URL = [DOC_URL, "tutoriels/video-le-cadre-juridique"].join("/") LISTE_DES_DEMARCHES_URL = [DOC_URL, "listes-des-demarches"].join("/") CGU_URL = ENV.fetch("CGU_URL", [DOC_URL, "cgu"].join("/")) MENTIONS_LEGALES_URL = ENV.fetch("MENTIONS_LEGALES_URL", "/mentions-legales") -ACCESSIBILITE_URL = ENV.fetch("ACCESSIBILITE_URL", [DOC_URL, "declaration-daccessibilite"].join("/")) +ACCESSIBILITE_URL = ENV.fetch("ACCESSIBILITE_URL", "/declaration-accessibilite") API_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "graphql"].join("/") WEBHOOK_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "webhook"].join("/") ARCHIVAGE_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "archivage-longue-duree-des-demarches"].join("/") diff --git a/config/locales/en.yml b/config/locales/en.yml index fea3d06cf..e9b964324 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -103,23 +103,107 @@ en: legal_notice: title: "Legal Notices" editing: "Editor" - editing_content: + editing_content: line_one: "Interministerial Directorate for Digital Affairs (DINUM)" direction: "Publishing Department" direction_content: "Ms. Stéphanie Schaer , Interministerial Director of Digital Affairs." hosting: "Hosting provider" hosting_content: line_four: "VAT NUMBER: FR 22 424 761 419" - line_five: "Head office : 2 rue Kellermann - 59100 Roubaix - France." - accessibility_statement: + line_five: "Head office : 2 rue Kellermann - 59100 Roubaix - France." + accessibility_statement: title: "Accessibility statement" - intro: "DINUM is committed to making its service accessible in accordance with Article 47 of Law No. 2005-102 of 11 February 2005." - compliance: "Compliance status" - results: "Test results" - no_accessible: "Non-accessible content" - preparation: "Preparation of this accessibility declaration" - contact: "Improvement and contact" - remedies: "Remedies" + line_one: "DINUM is committed to making its service accessible in accordance with Article 47 of Law No. 2005-102 of 11 February 2005." + line_two: "This accessibility statement applies to Démarches simplifiées" + compliance: + title: "Compliance status" + line_one_html: "The website Démarches simplifiées is partially compliant with the General Accessibility Guidelines (RGAA) version 4." + results: + title: "Test results" + line_one: "As of 1 April 2023, the average compliance rate of the site is 75%." + line_three: "Users can follow the measures taken by the service to improve the accessibility of the site at the following address:" + programme: + label: "Follow the DS accessibility continuous improvement programme" + url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr/issues?q=accessibilit%C3%A9+" + title: "Follow the DS accessibility continuous improvement programme - new tab" + no_accessible: + title: "Non-accessible content" + subtitle_one: "Non-compliances" + examples_html: "Exemples : + +

We are taking this into account for the future development of the site's pages.

+ " + preparation: + title: "Preparation of this accessibility declaration" + intro: "This declaration was drawn up on 27 April 2022. It was updated on 1 April 2023." + subtitle_one: "Technologies used to create the site" + techno_ruby: + label: "Ruby on Rails" + url: "https://rubyonrails.org/" + title: "Ruby on Rails - new tab" + subtitle_two: "Test environment" + environment_intro: "The content rendering checks were carried out on the basis of a combination provided by the RGAA reference base, with the following versions:" + environment_one: "Firefox 111.0.1 and NVDA 2022.4" + environment_two: "Safari and VoiceOver (version available on macOS Monterey 12.6.3)" + environment_three: "Edge and JAWS 2020" + subtitle_three: "Tools for assessing accessibility" + tool_one: "RGAA Assistant (Firefox extension)" + tool_two: "Web Developer (Firefox extension)" + tool_three: "HeadingsMap (Firefox extension)" + tool_four: "Colour Contrast Analyser application" + tool_five: "Contrast Finder" + tool_six: "Stylus (Firefox extension)" + subtitle_four: "Pages of the site subject to the compliance check" + page_one: + label: "Démarches simplifiées" + page_two: + label: "Contact" + page_three: + label: "Legal notices" + page_four: + label: "Accessibility statement" + page_five: + label: "Authentification" + page_six: "Home page - User search results" + page_seven: + label: "FAQ" + url: "https://faq.demarches-simplifiees.fr/" + title: "FAQ - new tab" + page_eight: + label: "FAQ - User (submission of a file)" + url: "https://faq.demarches-simplifiees.fr/collection/17-usager-depot-dun-dossier" + title: "FAQ - User (submission of a file) - new tab" + page_nine: "Documentation - Presentation" + page_ten: "Documentation - Start-up" + page_eleven: "Documentation - General" + page_twelve: "File creation - Identity" + page_thirteen: "File creation - Draft" + page_fourteen: "Dossier - Summary" + page_fifteen: "Dossier - Application" + page_sixteen: "Dossier - Messaging" + contact: + title: "Feedback and contact" + intro: "If you are unable to access a piece of content or service, you can contact the Simplified Approaches manager to be directed to an accessible alternative or obtain the content in another form." + infos: + email_html: "By email:" + phone_html: "Contact DINUM by phone:" + adress_html: "By post : DINUM , 20 avenue de Ségur 75007 Paris" + remedies: + title: "Remedies" + line_one: "If you notice a lack of accessibility that prevents you from accessing a content or functionality of the site, and you report it to us and do not manage to obtain a rapid response from us, you are entitled to send your complaints or a request for referral to the Rights Defender." + line_two: "Several means are available to you:" + remedies_one: + label: "A contact form" + url: "https://www.defenseurdesdroits.fr/nous-contacter" + title: "A contact form - new tab" + remedies_two: + label: "Contact the delegate of the Human Rights Defender in your region" + url: "https://www.defenseurdesdroits.fr/fr/saisir/delegues" + title: "Contact the delegate of the Human Rights Defender in your region - new tab" + remedies_three: "Send a letter by post (free of charge, do not put a stamp) Défenseur des droits Libre réponse 71120 75342 Paris CEDEX 07" commencer: show: start_procedure: Start the procedure diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 342978a81..a5991ab1c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -94,7 +94,7 @@ fr: legal_notice: title: "Mentions légales" editing: "Éditeur" - editing_content: + editing_content: line_one: "Direction Interministérielle au Numérique (DINUM)" line_two: "20 Avenue de Ségur" line_three: "75007 PARIS" @@ -106,16 +106,100 @@ fr: line_two: "RCS Roubaix – Tourcoing 424 761 419 00045" line_three: "Code APE 6202A" line_four: "N° TVA : FR 22 424 761 419" - line_five: "Siège social : 2 rue Kellermann - 59100 Roubaix - France." - accessibility_statement: + line_five: "Siège social : 2 rue Kellermann - 59100 Roubaix - France." + accessibility_statement: title: "Déclaration d’accessibilité" - intro: "La DINUM s’engage à rendre son service accessible, conformément à l’article 47 de la loi n° 2005-102 du 11 février 2005." - compliance: "État de conformité" - results: "Résultats des tests" - no_accessible: "Contenus non accessibles" - preparation: "Établissement de cette déclaration d’accessibilité" - contact: "Amélioration et contact" - remedies: "Voies de recours" + line_one: "La DINUM s’engage à rendre son service accessible, conformément à l’article 47 de la loi n° 2005-102 du 11 février 2005." + line_two: "Cette déclaration d’accessibilité s’applique à Démarches simplifiées" + compliance: + title: "État de conformité" + line_one_html: "Le site Démarches simplifiées est partiellement conforme avec le référentiel général d’amélioration de l’accessibilité (RGAA) version 4." + results: + title: "Résultats des tests" + line_one: "En date du 1er avril 2023, le taux moyen de conformité du site est de 75%." + line_three: "Les usagers peuvent suivre les mesures engagées par le service pour améliorer l’accessibilité du site à l’adresse suivante :" + programme: + label: "Suivez le programme d'amélioration continue de DS en matière d'accessibilité" + url: "https://github.com/demarches-simplifiees/demarches-simplifiees.fr/issues?q=accessibilit%C3%A9+" + title: "Suivez le programme d'amélioration continue de DS en matière d'accessibilité - nouvel onglet" + no_accessible: + title: "Contenus non accessibles" + subtitle_one: "Non-conformités" + examples_html: "Exemples : + +

Nous en tenons compte pour les futures évolutions des pages du site.

+ " + preparation: + title: "Établissement de cette déclaration d’accessibilité" + intro: "Cette déclaration a été établie le 27 avril 2022. Elle a été mise à jour le 1er avril 2023." + subtitle_one: "Technologies utilisées pour la réalisation du site" + techno_ruby: + label: "Ruby on Rails" + url: "https://rubyonrails.org/" + title: "Ruby on Rails - nouvel onglet" + subtitle_two: "Environnement de test" + environment_intro: "Les vérifications de restitution de contenus ont été réalisées sur la base d’une combinaison fournie par la base de référence du RGAA, avec les versions suivantes :" + environment_one: "Firefox 111.0.1 et NVDA 2022.4" + environment_two: "Safari et VoiceOver (version disponible sur macOS Monterey 12.6.3)" + environment_three: "Edge et JAWS 2020" + subtitle_three: "Outils pour évaluer l’accessibilité" + tool_one: "Assistant RGAA (extension Firefox)" + tool_two: "Web Developer (extension Firefox)" + tool_three: "HeadingsMap (extension Firefox)" + tool_four: "Application Colour Contrast Analyser" + tool_five: "Contrast Finder" + tool_six: "Stylus (extension Firefox)" + subtitle_four: "Pages du site ayant fait l’objet de la vérification de conformité" + page_one: + label: "Démarches simplifiées" + page_two: + label: "Contact" + page_three: + label: "Mentions légales" + page_four: + label: "Déclaration d’accessibilité" + page_five: + label: "Authentification" + page_six: "Accueil connecté - Résultats de recherche usager" + page_seven: + label: "FAQ" + url: "https://faq.demarches-simplifiees.fr/" + title: "FAQ - nouvel onglet" + page_eight: + label: "FAQ - Usager (dépôt d'un dossier)" + url: "https://faq.demarches-simplifiees.fr/collection/17-usager-depot-dun-dossier" + title: "FAQ - Usager (dépôt d'un dossier) - nouvel onglet" + page_nine: "Documentation - Présentation" + page_ten: "Documentation - Démarrage" + page_eleven: "Documentation - Généralités" + page_twelve: "Création dossier - Identité" + page_thirteen: "Création dossier - Brouillon" + page_fourteen: "Dossier - Résumé" + page_fifteen: "Dossier - Demande" + page_sixteen: "Dossier - Messagerie" + contact: + title: "Retour d’information et contact" + intro: "Si vous n’arrivez pas à accéder à un contenu ou à un service, vous pouvez contacter le responsable de Démarches simplifiées pour être orienté vers une alternative accessible ou obtenir le contenu sous une autre forme." + infos: + email_html: "Par voie électronique :" + phone_html: "Contacter la DINUM par téléphone :" + adress_html: "Par voie postale : DINUM , 20 avenue de Ségur 75007 Paris" + remedies: + title: "Voies de recours" + line_one: "Si vous constatez un défaut d’accessibilité vous empêchant d’accéder à un contenu ou une fonctionnalité du site, que vous nous le signalez et que vous ne parvenez pas à obtenir une réponse rapide de notre part, vous êtes en droit de faire parvenir vos doléances ou une demande de saisine au Défenseur des droits." + line_two: "Plusieurs moyens sont à votre disposition :" + remedies_one: + label: "Un formulaire de contact" + url: "https://www.defenseurdesdroits.fr/nous-contacter" + title: "Un formulaire de contact - nouvel onglet" + remedies_two: + label: "Contacter le délégué du Défenseur des droits dans votre région" + url: "https://www.defenseurdesdroits.fr/fr/saisir/delegues" + title: "Contacter le délégué du Défenseur des droits dans votre région - nouvel onglet" + remedies_three: "Envoyer un courrier par la poste (gratuit, ne pas mettre de timbre) Défenseur des droits Libre réponse 71120 75342 Paris CEDEX 07" commencer: show: start_procedure: Commencer la démarche diff --git a/config/locales/links.en.yml b/config/locales/links.en.yml index 45d6293d1..93e8eb0ac 100644 --- a/config/locales/links.en.yml +++ b/config/locales/links.en.yml @@ -32,7 +32,6 @@ en: accessibilite: label: "Accessibility: partially compliant" title: "Accessibility declaration" - url: "https://www.demarches-simplifiees.fr/declaration-accessibilite" api_doc: label: "API Documentation" title: "API Documentation" diff --git a/config/locales/links.fr.yml b/config/locales/links.fr.yml index 523ea32e0..a6c68d929 100644 --- a/config/locales/links.fr.yml +++ b/config/locales/links.fr.yml @@ -32,7 +32,6 @@ fr: accessibilite: label: "Accessibilité : partiellement conforme" title: "Consulter notre déclaration d’accessibilité" - url: "https://www.demarches-simplifiees.fr/declaration-accessibilite" api_doc: label: "Documentation de l’API" title: "Documentation graphql de l’API"