diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss index 59317a60c..be434a232 100644 --- a/app/assets/stylesheets/buttons.scss +++ b/app/assets/stylesheets/buttons.scss @@ -283,7 +283,7 @@ ul.dropdown-items { } dd { - word-break: break-all; + word-break: break-word; } } diff --git a/app/components/dossiers/individual_form_component/individual_form_component.html.haml b/app/components/dossiers/individual_form_component/individual_form_component.html.haml index cbff6389d..961e9844a 100644 --- a/app/components/dossiers/individual_form_component/individual_form_component.html.haml +++ b/app/components/dossiers/individual_form_component/individual_form_component.html.haml @@ -46,11 +46,17 @@ %label.fr-label{ for: "identite_champ_radio_#{Individual::GENDER_MALE}" } = Individual.human_attribute_name('gender.male') .fr-fieldset__element.fr-mb-0 - %fieldset.fr-fieldset.width-100 + .fr-fieldset.width-100 .fr-fieldset__element.fr-fieldset__element--short-text - = render Dsfr::InputComponent.new(form: individual, attribute: :prenom, opts: { autocomplete: (for_tiers? ? false : 'given-name') }) + - if for_tiers? + = render Dsfr::InputComponent.new(form: individual, attribute: :prenom) + - else + = render Dsfr::InputComponent.new(form: individual, attribute: :prenom, opts: { autocomplete: 'given-name' }) .fr-fieldset__element.fr-fieldset__element--short-text - = render Dsfr::InputComponent.new(form: individual, attribute: :nom, opts: { autocomplete: (for_tiers? ? false : 'family-name') }) + - if for_tiers? + = render Dsfr::InputComponent.new(form: individual, attribute: :nom) + - else + = render Dsfr::InputComponent.new(form: individual, attribute: :nom, opts: { autocomplete: 'family-name' }) - if @dossier.procedure.ask_birthday? .fr-fieldset__element diff --git a/app/components/dossiers/user_procedure_filter_component/user_procedure_filter_component.html.haml b/app/components/dossiers/user_procedure_filter_component/user_procedure_filter_component.html.haml index 5dc7f9c04..4d0a003ac 100644 --- a/app/components/dossiers/user_procedure_filter_component/user_procedure_filter_component.html.haml +++ b/app/components/dossiers/user_procedure_filter_component/user_procedure_filter_component.html.haml @@ -1,4 +1,4 @@ -= form_with(url: dossiers_path, method: :get ) do |f| += form_with(url: dossiers_path, method: :get, class: "fr-mb-5w") do |f| = f.hidden_field :q, value: params[:q], id: nil = f.label :procedure_id, t('.procedures.label'), class: 'fr-label fr-mb-1w', for: 'procedure_select' .flex diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml index 77d6b9ada..fda1d2b0c 100644 --- a/app/views/layouts/_header.haml +++ b/app/views/layouts/_header.haml @@ -6,7 +6,7 @@ - is_administrateur_context = nav_bar_profile == :administrateur && administrateur_signed_in? - is_expert_context = nav_bar_profile == :expert && expert_signed_in? - is_user_context = nav_bar_profile == :user -- is_search_enabled = [params[:controller] == 'recherche', is_instructeur_context, is_expert_context, is_user_context && current_user.dossiers.count].any? +- is_search_enabled = [params[:controller] == 'recherche', is_instructeur_context, is_expert_context].any? %header{ class: ["fr-header", content_for?(:notice_info) && "fr-header__with-notice-info"], role: "banner", "data-controller": "dsfr-header" } %nav{ :role => "navigation", "aria-label" => t('layouts.header.main_menu') } .fr-header__body diff --git a/app/views/layouts/commencer/_no_procedure.html.haml b/app/views/layouts/commencer/_no_procedure.html.haml index 7dbb9621b..ea58dcfe2 100644 --- a/app/views/layouts/commencer/_no_procedure.html.haml +++ b/app/views/layouts/commencer/_no_procedure.html.haml @@ -1,5 +1,5 @@ .center - = image_tag "landing/hero/dematerialiser.svg", class: "fr-responsive-img fr-mb-1v", alt: "" + = image_tag "landing/hero/dematerialiser.svg", class: "fr-responsive-img fr-mb-1v", alt: "", "aria-hidden": "true" %p.fr-m-4w= t('.text') %hr %p= t('.are_you_new', app_name: Current.application_name) diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index 295059499..18e879622 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -11,7 +11,7 @@ = t(".promise") .hero-illustration - %img{ :src => image_url("landing/hero/dematerialiser.svg"), alt: '', width: 499, height: 280, loading: 'lazy' } + %img{ :src => image_url("landing/hero/dematerialiser.svg"), alt: '', width: 499, height: 280, loading: 'lazy', 'aria-hidden': 'true' } .fr-background-alt--blue-france.fr-py-6w .container diff --git a/app/views/users/_main_navigation.html.haml b/app/views/users/_main_navigation.html.haml index ff77a42d0..c78c44cae 100644 --- a/app/views/users/_main_navigation.html.haml +++ b/app/views/users/_main_navigation.html.haml @@ -2,11 +2,11 @@ %ul.fr-nav__list - if params[:controller] == 'users/commencer' %li.fr-nav__item - = link_to t('back', scope: [:layouts, :header]), url_for(:back), title: t('back_title', scope: [:layouts, :header]), class: 'fr-nav__link', "aria-controls" => "modal-header__menu" + = link_to t('back', scope: [:layouts, :header]), url_for(:back), title: t('back_title', scope: [:layouts, :header]), class: 'fr-nav__link' %li.fr-nav__item - = link_to t('files', scope: [:layouts, :header]), dossiers_path, class: 'fr-nav__link', aria: { current: (controller_name == 'dossiers' && action_name != 'deleted_dossiers') ? 'true' : nil, controls: "modal-header__menu" } + = link_to t('files', scope: [:layouts, :header]), dossiers_path, class: 'fr-nav__link', aria: { current: (controller_name == 'dossiers' && action_name != 'deleted_dossiers') ? 'true' : nil } - if current_user.deleted_dossiers.present? %li.fr-nav__item - = link_to 'Historique des dossiers supprimés', deleted_dossiers_path(), class: 'fr-nav__link', aria: { current: action_name == 'deleted_dossiers' ? 'true' : nil, controls: "modal-header__menu" } + = link_to 'Historique des dossiers supprimés', deleted_dossiers_path(), class: 'fr-nav__link', aria: { current: action_name == 'deleted_dossiers' ? 'true' : nil } diff --git a/app/views/users/dossiers/identite.html.haml b/app/views/users/dossiers/identite.html.haml index 8f79877b4..82bb5bbab 100644 --- a/app/views/users/dossiers/identite.html.haml +++ b/app/views/users/dossiers/identite.html.haml @@ -1,4 +1,4 @@ -- content_for(:title, "Nouveau dossier (#{@dossier.procedure.libelle})") +- content_for(:title, t(".title", scope: :metas, procedure_label: @dossier.procedure.libelle)) = render partial: "shared/dossiers/submit_is_over", locals: { dossier: @dossier } @@ -6,9 +6,12 @@ - if @dossier.procedure.for_tiers_enabled? = form_for @dossier, url: identite_dossier_path(@dossier), method: :patch, html: { class: "form" }, data: {turbo: true, controller: :autosubmit} do |f| - %fieldset#radio-rich-hint.fr-fieldset{ "aria-labelledby" => "radio-rich-hint-legend radio-rich-hint-messages" } - %legend#radio-rich-hint-legend.fr-fieldset__legend--regular.fr-fieldset__legend + %p.fr-text--sm= t('utils.asterisk_html') + + %fieldset#radio-rich-hint.fr-fieldset + %legend.fr-fieldset__legend--regular.fr-fieldset__legend = t('views.users.dossiers.identite.legend') + = render EditableChamp::AsteriskMandatoryComponent.new .fr-fieldset__element .fr-radio-group.fr-radio-rich @@ -25,6 +28,6 @@ .fr-radio-rich__img %span.fr-icon-parent-fill - = f.submit t('views.users.dossiers.identite.continue'), class: 'visually-hidden' + = f.submit t('views.users.dossiers.identite.continue'), class: 'hidden' = render Dossiers::IndividualFormComponent.new(dossier: @dossier) diff --git a/config/locales/en.yml b/config/locales/en.yml index b66e65ec4..ffebb947e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -82,7 +82,7 @@ en: header: close_modal: 'Close' back: "Back" - back_title: "Revenir sur le site de mon administration" + back_title: "Back to my administration's website" main_menu: "Main menu" locale_dropdown: select_locale: "Choose a language" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 008c85800..b8b280bbd 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -73,7 +73,7 @@ fr: header: close_modal: 'Fermer' back: "Revenir en arrière" - back_title: "Revenir sur le site de mon administration" + back_title: "Revenir en arrière, sur le site de mon administration" main_menu: "Menu principal" locale_dropdown: select_locale: "Sélectionner une langue" diff --git a/config/locales/metas.en.yml b/config/locales/metas.en.yml index 68e67b732..a8533b1bf 100644 --- a/config/locales/metas.en.yml +++ b/config/locales/metas.en.yml @@ -9,6 +9,8 @@ en: index: title: Files title_search: "Search: %{terms}" + identite: + title: "New file (%{procedure_label}) - Step 1: Identity" show: title: "Summary · File nº %{number} (%{procedure_label})" demande: diff --git a/config/locales/metas.fr.yml b/config/locales/metas.fr.yml index 18cdd9529..b8cc06caf 100644 --- a/config/locales/metas.fr.yml +++ b/config/locales/metas.fr.yml @@ -9,6 +9,8 @@ fr: index: title: Dossiers title_search: "Recherche : %{terms}" + identite: + title: "Nouveau dossier (%{procedure_label}) - Étape 1 : Identité" show: title: "Résumé · Dossier nº %{number} (%{procedure_label})" demande: