From 1cec1b91c1654792812cb6cba0658ffa365020ca Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Wed, 22 May 2024 16:31:42 +0200 Subject: [PATCH] page modifications historique --- .../modifications_component.fr.yml | 4 ++-- .../modifications_component.html.haml | 2 +- .../procedures/modifications.html.haml | 14 ++++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/components/procedure/card/modifications_component/modifications_component.fr.yml b/app/components/procedure/card/modifications_component/modifications_component.fr.yml index e46fc4f3c..676fc64cd 100644 --- a/app/components/procedure/card/modifications_component/modifications_component.fr.yml +++ b/app/components/procedure/card/modifications_component/modifications_component.fr.yml @@ -1,5 +1,5 @@ --- fr: title: - one: Modification - other: Modifications + one: Modification du formulaire + other: Modifications du formulaire diff --git a/app/components/procedure/card/modifications_component/modifications_component.html.haml b/app/components/procedure/card/modifications_component/modifications_component.html.haml index 7ee37782a..9dc203c17 100644 --- a/app/components/procedure/card/modifications_component/modifications_component.html.haml +++ b/app/components/procedure/card/modifications_component/modifications_component.html.haml @@ -8,5 +8,5 @@ %h3.fr-h6 = t('.title', count: @procedure.revisions_count) - %p.fr-tile-subtitle Historique des modifications du formulaire + %p.fr-tile-subtitle Historique des modifications apportées au formulaire %p.fr-btn.fr-btn--tertiary Voir diff --git a/app/views/administrateurs/procedures/modifications.html.haml b/app/views/administrateurs/procedures/modifications.html.haml index a3775ada7..6c890f8fe 100644 --- a/app/views/administrateurs/procedures/modifications.html.haml +++ b/app/views/administrateurs/procedures/modifications.html.haml @@ -1,12 +1,12 @@ = render partial: 'administrateurs/breadcrumbs', locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)], [@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)], - ['Modifications']] } -.container - %h1.page-title + ['Historique des modifications du formulaire']] } +.fr-container + %h1.fr-h2 Historique des modifications du formulaire -.container +.fr-container - previous_revision = nil - @procedure.revisions.each do |revision| - if previous_revision.present? && !revision.draft? @@ -30,3 +30,9 @@ %p= t('.dossiers_en_instruction', count: dossiers_en_instruction_count) = render Procedure::RevisionChangesComponent.new changes:, previous_revision: - previous_revision = revision + +.padded-fixed-footer + .fixed-footer.fr-pb-2w + .fr-container + = link_to admin_procedure_path(id: @procedure), class: 'fr-link fr-icon-arrow-left-line fr-link--icon-left' do + Revenir à l'écran de gestion