diff --git a/app/views/instructeurs/_breadcrumbs.html.haml b/app/views/instructeurs/_breadcrumbs.html.haml index 66d80be46..662c6dfc6 100644 --- a/app/views/instructeurs/_breadcrumbs.html.haml +++ b/app/views/instructeurs/_breadcrumbs.html.haml @@ -1,4 +1,4 @@ -%nav.fr-mb-0.fr-breadcrumb.mt-0{ role: "navigation", aria: { label: t('you_are_here', scope: [:layouts, :breadcrumb]) } } +%nav.fr-breadcrumb.fr-mt-0.fr-mb-1w{ role: "navigation", aria: { label: t('you_are_here', scope: [:layouts, :breadcrumb]) } } %button.fr-breadcrumb__button{ aria: { expanded: "false", controls: "breadcrumb-1" } } = t('show', scope: [:layouts, :breadcrumb]) @@ -10,4 +10,4 @@ - if i == steps.size - 1 %li= link_to step[0], '', { aria: { current: "page" } , class: 'fr-breadcrumb__link' } - else - %li= link_to "#{step[0]} - Suivi des dossiers", step[1], class: 'fr-breadcrumb__link' + %li= link_to step[0], step[1], class: 'fr-breadcrumb__link' diff --git a/app/views/instructeurs/dossiers/_header.html.haml b/app/views/instructeurs/dossiers/_header.html.haml index 6432f87aa..0a0a1607a 100644 --- a/app/views/instructeurs/dossiers/_header.html.haml +++ b/app/views/instructeurs/dossiers/_header.html.haml @@ -6,6 +6,10 @@ pour voir si l'opération est finie. .sub-header + .fr-container.flex.justify-between.align-baseline.column= render partial: 'instructeurs/breadcrumbs', + locals: { steps: [[t('show_procedure', scope: [:layouts, :breadcrumb], libelle: dossier.procedure.libelle.truncate(22)), instructeur_procedure_path(dossier.procedure)], + [t('show_dossier', scope: [:layouts, :breadcrumb], dossier_id: dossier.id, owner_name: dossier.owner_name)]] } + = render partial: 'instructeurs/dossiers/header_top', locals: { dossier: } = render partial: 'instructeurs/dossiers/header_bottom', locals: { dossier:, gallery_attachments: } diff --git a/app/views/instructeurs/dossiers/_header_top.html.haml b/app/views/instructeurs/dossiers/_header_top.html.haml index 7fe1fb2f8..f01fc0d4b 100644 --- a/app/views/instructeurs/dossiers/_header_top.html.haml +++ b/app/views/instructeurs/dossiers/_header_top.html.haml @@ -2,7 +2,7 @@ .flex %div %h1.fr-h3.fr-mb-1w - = "Dossier nº #{dossier.id}" + = t('show_dossier', scope: [:layouts, :breadcrumb], dossier_id: dossier.id, owner_name: dossier.owner_name) = link_to dossier.procedure.libelle.truncate_words(10), instructeur_procedure_path(dossier.procedure), title: dossier.procedure.libelle, class: "fr-link" .fr-mt-2w.fr-badge-group diff --git a/app/views/instructeurs/procedures/administrateurs.html.haml b/app/views/instructeurs/procedures/administrateurs.html.haml index 4af281b0e..9219ca46a 100644 --- a/app/views/instructeurs/procedures/administrateurs.html.haml +++ b/app/views/instructeurs/procedures/administrateurs.html.haml @@ -3,7 +3,7 @@ .sub-header .fr-container.flex.column = render partial: 'instructeurs/breadcrumbs', - locals: { steps: [[@procedure.libelle.truncate_words(10), administrateurs_instructeur_procedure_path(@procedure)],[t('instructeurs.dossiers.header.banner.administrators_list')]] } + locals: { steps: [[t('show_procedure', scope: [:layouts, :breadcrumb], libelle: @procedure.libelle.truncate(22)), instructeur_procedure_path(@procedure)],[t('instructeurs.dossiers.header.banner.administrators_list')]] } = render partial: 'instructeurs/procedures/header', locals: { procedure: @procedure } diff --git a/app/views/instructeurs/procedures/deleted_dossiers.html.haml b/app/views/instructeurs/procedures/deleted_dossiers.html.haml index 04101b41f..cfa853d0b 100644 --- a/app/views/instructeurs/procedures/deleted_dossiers.html.haml +++ b/app/views/instructeurs/procedures/deleted_dossiers.html.haml @@ -3,7 +3,7 @@ .sub-header .fr-container.flex.column = render partial: 'instructeurs/breadcrumbs', - locals: { steps: [[@procedure.libelle.truncate_words(10), instructeur_procedure_path(@procedure)], + locals: { steps: [[t('show_procedure', scope: [:layouts, :breadcrumb], libelle: @procedure.libelle.truncate(22)), instructeur_procedure_path(@procedure)], ['Historique des dossiers supprimés']] } = render partial: 'instructeurs/procedures/header', diff --git a/app/views/instructeurs/procedures/email_notifications.html.haml b/app/views/instructeurs/procedures/email_notifications.html.haml index 87300c39d..bc985bc2a 100644 --- a/app/views/instructeurs/procedures/email_notifications.html.haml +++ b/app/views/instructeurs/procedures/email_notifications.html.haml @@ -3,7 +3,7 @@ .sub-header .fr-container.flex.column = render partial: 'instructeurs/breadcrumbs', - locals: { steps: [[@procedure.libelle.truncate_words(10), instructeur_procedure_path(@procedure)], + locals: { steps: [[t('show_procedure', scope: [:layouts, :breadcrumb], libelle: @procedure.libelle.truncate(22)), instructeur_procedure_path(@procedure)], [t('instructeurs.dossiers.header.banner.notification_management')]] } = render partial: 'instructeurs/procedures/header', locals: { procedure: @procedure } diff --git a/app/views/instructeurs/procedures/email_usagers.html.haml b/app/views/instructeurs/procedures/email_usagers.html.haml index 937dbdce5..531b941e9 100644 --- a/app/views/instructeurs/procedures/email_usagers.html.haml +++ b/app/views/instructeurs/procedures/email_usagers.html.haml @@ -3,7 +3,7 @@ .sub-header .fr-container.flex.column = render partial: 'instructeurs/breadcrumbs', - locals: { steps: [[@procedure.libelle.truncate_words(10), instructeur_procedure_path(@procedure)], + locals: { steps: [[t('show_procedure', scope: [:layouts, :breadcrumb], libelle: @procedure.libelle.truncate(22)), instructeur_procedure_path(@procedure)], [t('instructeurs.dossiers.header.banner.contact_users')]] } = render partial: 'instructeurs/procedures/header', locals: { procedure: @procedure } diff --git a/app/views/instructeurs/procedures/show.html.haml b/app/views/instructeurs/procedures/show.html.haml index 14dc7f824..cb4f5960d 100644 --- a/app/views/instructeurs/procedures/show.html.haml +++ b/app/views/instructeurs/procedures/show.html.haml @@ -4,7 +4,7 @@ .sub-header .fr-container.flex.column = render partial: 'instructeurs/breadcrumbs', - locals: { steps: [[@procedure.libelle.truncate_words(10), instructeur_procedure_path(@procedure)]] } + locals: { steps: [[t('show_procedure', scope: [:layouts, :breadcrumb], libelle: @procedure.libelle.truncate(22)), instructeur_procedure_path(@procedure)]] } = render partial: 'header', locals: { procedure: @procedure, statut: @statut } %hr %h1.fr-h5.fr-mb-0= t('.file_tracking') diff --git a/app/views/instructeurs/procedures/stats.html.haml b/app/views/instructeurs/procedures/stats.html.haml index 0ffd9d5c6..a9c5e152b 100644 --- a/app/views/instructeurs/procedures/stats.html.haml +++ b/app/views/instructeurs/procedures/stats.html.haml @@ -4,7 +4,7 @@ .sub-header .fr-container.flex.column = render partial: 'instructeurs/breadcrumbs', - locals: { steps: [[@procedure.libelle.truncate_words(10), instructeur_procedure_path(@procedure)], + locals: { steps: [[t('show_procedure', scope: [:layouts, :breadcrumb], libelle: @procedure.libelle.truncate(22)), instructeur_procedure_path(@procedure)], [t('instructeurs.dossiers.header.banner.statistics')]] } = render partial: 'instructeurs/procedures/header', diff --git a/config/locales/views/layouts/_breadcrumb.en.yml b/config/locales/views/layouts/_breadcrumb.en.yml index d6003ef6f..e7b096450 100644 --- a/config/locales/views/layouts/_breadcrumb.en.yml +++ b/config/locales/views/layouts/_breadcrumb.en.yml @@ -16,3 +16,5 @@ en: go_to_FAQ: "read FAQ" url_FAQ: "/faq#accordion-administrateur-2" faq: Frequently Asked Questions + show_dossier: "File nº %{dossier_id} – %{owner_name}" + show_procedure: '%{libelle} – Files' diff --git a/config/locales/views/layouts/_breadcrumb.fr.yml b/config/locales/views/layouts/_breadcrumb.fr.yml index 5fd78a4d2..46546bda7 100644 --- a/config/locales/views/layouts/_breadcrumb.fr.yml +++ b/config/locales/views/layouts/_breadcrumb.fr.yml @@ -16,3 +16,5 @@ fr: go_to_FAQ: "consulter la FAQ" url_FAQ: "/faq#accordion-administrateur-2" faq: Foire aux Questions + show_dossier: "Dossier nº %{dossier_id} – %{owner_name}" + show_procedure: '%{libelle} – Suivi des dossiers'