diff --git a/app/components/dossiers/user_filter_component/user_filter_component.html.haml b/app/components/dossiers/user_filter_component/user_filter_component.html.haml index 52e270d4b..fe2338166 100644 --- a/app/components/dossiers/user_filter_component/user_filter_component.html.haml +++ b/app/components/dossiers/user_filter_component/user_filter_component.html.haml @@ -1,6 +1,6 @@ .fr-grid-row .fr-col-12 - %nav.fr-translate.fr-nav + .fr-translate.fr-nav .fr-nav__item.custom-fr-translate-flex-end %button.fr-translate__btn.translate-no-icon.fr-btn.fr-btn--tertiary.custom-fr-translate-no-icon{ "aria-controls" => "filters", "aria-expanded" => "false", title: t('.button.select_filters') } = t('.button.select_filters') diff --git a/app/components/main_navigation/instructeur_expert_navigation_component/instructeur_expert_navigation_component.html.haml b/app/components/main_navigation/instructeur_expert_navigation_component/instructeur_expert_navigation_component.html.haml index 70f647517..ee0d7dbb6 100644 --- a/app/components/main_navigation/instructeur_expert_navigation_component/instructeur_expert_navigation_component.html.haml +++ b/app/components/main_navigation/instructeur_expert_navigation_component/instructeur_expert_navigation_component.html.haml @@ -1,4 +1,4 @@ -%nav#header-navigation.fr-nav{ role: :navigation, "aria-label" => t('main_menu', scope: [:layouts, :header]) } +#header-navigation.fr-nav %ul.fr-nav__list - if instructeur? %li.fr-nav__item diff --git a/app/views/administrateurs/_main_navigation.html.haml b/app/views/administrateurs/_main_navigation.html.haml index 4c6010d04..f775ff34a 100644 --- a/app/views/administrateurs/_main_navigation.html.haml +++ b/app/views/administrateurs/_main_navigation.html.haml @@ -1,4 +1,4 @@ -%nav#header-navigation.fr-nav{ role: 'navigation', 'aria-label': 'Menu principal administrateur' } +#header-navigation.fr-nav %ul.fr-nav__list %li.fr-nav__item= link_to 'Mes démarches', admin_procedures_path, class:'fr-nav__link', 'aria-current': current_page?(controller: 'administrateurs/procedures', action: :index) ? 'true' : nil - if Rails.application.config.ds_zonage_enabled diff --git a/app/views/gestionnaires/groupe_gestionnaires/_main_navigation.html.haml b/app/views/gestionnaires/groupe_gestionnaires/_main_navigation.html.haml index 842b52017..f239b1ebc 100644 --- a/app/views/gestionnaires/groupe_gestionnaires/_main_navigation.html.haml +++ b/app/views/gestionnaires/groupe_gestionnaires/_main_navigation.html.haml @@ -1,4 +1,4 @@ - content_for(:main_navigation) do - %nav#header-navigation.fr-nav{ role: 'navigation', 'aria-label': 'Menu principal gestionnaire' } + #header-navigation.fr-nav %ul.fr-nav__list %li.fr-nav__item= link_to 'Mes groupes gestionnaires', gestionnaire_groupe_gestionnaires_path, class:'fr-nav__link', 'aria-current': current_page?(controller: 'groupe_gestionnaires', action: :index) ? 'page' : nil diff --git a/app/views/super_admins/release_notes/_main_navigation.html.haml b/app/views/super_admins/release_notes/_main_navigation.html.haml index 1485a91fa..5dd71e776 100644 --- a/app/views/super_admins/release_notes/_main_navigation.html.haml +++ b/app/views/super_admins/release_notes/_main_navigation.html.haml @@ -1,5 +1,5 @@ - content_for(:main_navigation) do - %nav.fr-nav#header-navigation{ role: "navigation", aria: { label: 'Menu principal annonces' } } + #header-navigation.fr-nav %ul.fr-nav__list %li.fr-nav__item = link_to "Toutes les annonces", super_admins_release_notes_path, class: "fr-nav__link", target: "_self", aria: { current: action == :index ? "page" : nil } diff --git a/app/views/users/_main_navigation.html.haml b/app/views/users/_main_navigation.html.haml index 4d10e5a49..42aeb669b 100644 --- a/app/views/users/_main_navigation.html.haml +++ b/app/views/users/_main_navigation.html.haml @@ -1,4 +1,4 @@ -%nav#header-navigation.fr-nav{ role: :navigation, "aria-label" => t('main_menu', scope: [:layouts, :header]) } +#header-navigation.fr-nav %ul.fr-nav__list - if params[:controller] == 'users/commencer' %li.fr-nav__item