From 772ae47521892667e1096aeaf241b0e0ce4bbdfe Mon Sep 17 00:00:00 2001
From: Lisa Durand <lisa.c.durand@gmail.com>
Date: Wed, 26 Jun 2024 16:47:53 +0200
Subject: [PATCH] change print to download button for user

---
 app/views/users/dossiers/_merci.html.haml              | 2 +-
 app/views/users/dossiers/show/_header.html.haml        | 4 ++--
 app/views/users/dossiers/show/_print_dossier.html.haml | 2 +-
 config/locales/en.yml                                  | 1 -
 config/locales/fr.yml                                  | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/users/dossiers/_merci.html.haml b/app/views/users/dossiers/_merci.html.haml
index a3f30856c..f55bad730 100644
--- a/app/views/users/dossiers/_merci.html.haml
+++ b/app/views/users/dossiers/_merci.html.haml
@@ -20,7 +20,7 @@
         - if procedure.active_dossier_submitted_message
           %p.fr-m-2= procedure.active_dossier_submitted_message.message_on_submit_by_usager
     %p.justify-center.flex.fr-mb-5w.fr-mt-2w
-      = link_to "#{t('views.users.dossiers.merci.download_dossier')} (PDF)", dossier ? dossier_path(dossier, format: :pdf) : "#", download: "Mon dossier", target: "_blank", rel: "noopener", title: t('views.users.dossiers.show.header.print_dossier'), class: 'fr-btn fr-btn--secondary fr-mx-2w fr-btn--icon-left fr-icon-download-line'
+      = render(partial: 'users/dossiers/show/print_dossier', locals: { dossier: dossier })
       = link_to t('views.users.dossiers.merci.acces_dossier'), dossier ? dossier_path(dossier) : "#dossier" , class: 'fr-btn fr-mx-2w'
 
     %hr.fr-hr
diff --git a/app/views/users/dossiers/show/_header.html.haml b/app/views/users/dossiers/show/_header.html.haml
index 2d0a73858..428ca6eb9 100644
--- a/app/views/users/dossiers/show/_header.html.haml
+++ b/app/views/users/dossiers/show/_header.html.haml
@@ -14,12 +14,12 @@
     - if dossier.show_procedure_state_warning?
       = render(partial: 'users/dossiers/procedure_removed_banner', locals: { dossier: dossier })
     - elsif current_user.owns?(dossier)
-      .header-actions
+      .header-actions.fr-mb-3w
         = render partial: 'invites/dropdown', locals: { dossier: dossier, morphing: false }
+        = render(partial: 'users/dossiers/show/print_dossier', locals: { dossier: dossier })
         - if dossier.can_be_updated_by_user? && !current_page?(modifier_dossier_path(dossier))
           = link_to t('views.users.dossiers.demande.edit_dossier'), modifier_dossier_path(dossier), class: 'fr-btn fr-btn-sm',
             title: t('views.users.dossiers.demande.edit_dossier_title')
-        = render(partial: 'users/dossiers/show/print_dossier', locals: { dossier: dossier })
 
     %nav.fr-tabs
       %ul.fr-tabs__list{ role: 'tablist' }
diff --git a/app/views/users/dossiers/show/_print_dossier.html.haml b/app/views/users/dossiers/show/_print_dossier.html.haml
index 1e2392431..bbc169f37 100644
--- a/app/views/users/dossiers/show/_print_dossier.html.haml
+++ b/app/views/users/dossiers/show/_print_dossier.html.haml
@@ -1 +1 @@
-= link_to t('views.users.dossiers.show.header.print'), dossier_path(dossier, format: :pdf), target: "_blank", rel: "noopener", title: t('views.users.dossiers.show.header.print_dossier'), class: 'fr-btn fr-icon-printer-line fr-btn--tertiary'
+= link_to "#{t('views.users.dossiers.merci.download_dossier')} (PDF)", dossier ? dossier_path(dossier, format: :pdf) : "#", download: "Mon dossier", target: "_blank", rel: "noopener", title: t('views.users.dossiers.show.header.print_dossier'), class: 'fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-download-line'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 23860d6be..4d5e60ab1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -465,7 +465,6 @@ en:
             dossier_number: "File n. %{dossier_id}"
             created_date: "- Draft on %{date_du_dossier}"
             submit_date: "- Submit on %{date_du_dossier}"
-            print: "print"
             print_dossier: "All the file"
           status_overview:
             status_draft: draft
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4559e8795..cedada2ef 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -467,7 +467,6 @@ fr:
             dossier_number: "Dossier nº %{dossier_id}"
             created_date: "- En brouillon depuis le %{date_du_dossier}"
             submit_date: "- Déposé le %{date_du_dossier}"
-            print: "imprimer"
             print_dossier: "Tout le dossier"
           status_overview:
             status_draft: brouillon