diff --git a/app/components/dossiers/export_link_component/export_link_component.html.haml b/app/components/dossiers/export_link_component/export_link_component.html.haml index 15e8d171e..77b9eba4d 100644 --- a/app/components/dossiers/export_link_component/export_link_component.html.haml +++ b/app/components/dossiers/export_link_component/export_link_component.html.haml @@ -6,11 +6,7 @@ %span= ready_link_label_extra_infos(export) - if export.old? = button_to refresh_button_options(export)[:title], download_export_path(export_format: export.format, statut: export.statut, force_export: true), refresh_button_options(export).merge(role: 'menuitem') - - elsif export.failed? - %li.fr-mb-2w - = failed_label(export) - = button_to refresh_button_options(export)[:title], download_export_path(export_format: export.format, statut: export.statut, force_export: true), refresh_button_options(export).merge(role: 'menuitem') - - else + - elsif export.pending? %li.fr-mb-2w %span{ data: poll_controller_options(export) } = pending_label(export) diff --git a/app/controllers/administrateurs/exports_controller.rb b/app/controllers/administrateurs/exports_controller.rb index 25f413099..b5674c306 100644 --- a/app/controllers/administrateurs/exports_controller.rb +++ b/app/controllers/administrateurs/exports_controller.rb @@ -10,7 +10,7 @@ module Administrateurs if export.available? respond_to do |format| format.turbo_stream do - flash.notice = t('.export_available_html', file_format: export.format, file_url: export.file.url) + flash.notice = t('administrateurs.exports.export_available_html', file_format: export.format, file_url: export.file.url) end format.html do @@ -21,11 +21,11 @@ module Administrateurs respond_to do |format| format.turbo_stream do if !params[:no_progress_notification] - flash.notice = t('.export_pending') + flash.notice = t('administrateurs.exports.export_pending') end end format.html do - redirect_to admin_procedure_archives_url(@procedure), notice: t('.export_pending') + redirect_to admin_procedure_archives_url(@procedure), notice: t('administrateurs.exports.export_pending') end end end diff --git a/app/controllers/instructeurs/procedures_controller.rb b/app/controllers/instructeurs/procedures_controller.rb index 434afdb74..d3cdbe7e7 100644 --- a/app/controllers/instructeurs/procedures_controller.rb +++ b/app/controllers/instructeurs/procedures_controller.rb @@ -181,7 +181,7 @@ module Instructeurs if export.available? respond_to do |format| format.turbo_stream do - flash.notice = t('.export_available_html', file_format: export.format, file_url: export.file.url) + flash.notice = t('instructeurs.procedures.export_available_html', file_format: export.format, file_url: export.file.url) end format.html do @@ -192,11 +192,11 @@ module Instructeurs respond_to do |format| format.turbo_stream do if !params[:no_progress_notification] - flash.notice = t('.export_pending_html', url: exports_instructeur_procedure_path(procedure)) + flash.notice = t('instructeurs.procedures.export_pending_html', url: exports_instructeur_procedure_path(procedure)) end end format.html do - redirect_to exports_instructeur_procedure_path(procedure), notice: t('.export_pending_html', url: exports_instructeur_procedure_path(procedure)) + redirect_to exports_instructeur_procedure_path(procedure), notice: t('instructeurs.procedures.export_pending_html', url: exports_instructeur_procedure_path(procedure)) end end end diff --git a/app/views/instructeurs/procedures/exports.html.haml b/app/views/instructeurs/procedures/exports.html.haml index ff86e94d0..af3f6acfa 100644 --- a/app/views/instructeurs/procedures/exports.html.haml +++ b/app/views/instructeurs/procedures/exports.html.haml @@ -6,7 +6,10 @@ [t('.title')]] } .fr-container - %h1= title + %h1= t('.title') + = render Dsfr::CalloutComponent.new(title: nil) do |c| + - c.with_body do + %p= t('.export_description') - if @exports.present? = render Dossiers::ExportLinkComponent.new(procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count, class_btn: 'fr-btn--tertiary', export_url: method(:download_export_instructeur_procedure_path)) diff --git a/config/locales/views/instructeurs/procedures/exports/en.yml b/config/locales/views/instructeurs/procedures/exports/en.yml index f09bb59f3..9c0f3302d 100644 --- a/config/locales/views/instructeurs/procedures/exports/en.yml +++ b/config/locales/views/instructeurs/procedures/exports/en.yml @@ -4,4 +4,6 @@ en: export_available_html: The export in %{file_format} format is ready. You can download export_pending_html: We generate this export. You will be able to download it in a few minutes from the exports list. exports: + title: Exports list + export_description: This list of exports contains the exports you requested as well as those requested by instructors belonging to the same group. no_export_html: You have no export at the moment.
Can't find an export? It may have expired, exports are deleted after %{expiration_time} hours. diff --git a/config/locales/views/instructeurs/procedures/exports/fr.yml b/config/locales/views/instructeurs/procedures/exports/fr.yml index eb5ed79c0..6f8c49091 100644 --- a/config/locales/views/instructeurs/procedures/exports/fr.yml +++ b/config/locales/views/instructeurs/procedures/exports/fr.yml @@ -4,4 +4,6 @@ fr: export_available_html: L’export au format %{file_format} est prêt. Vous pouvez le télécharger export_pending_html: Nous générons cet export. Vous pourrez le télécharger dans quelques minutes depuis la liste des exports. exports: + title: Liste des exports + export_description: Cette liste d'exports contient les exports que vous avez demandé ainsi que ceux demandés par les instructeurs appartenant au même groupe. no_export_html: Vous n'avez pas d'export pour le moment.
Vous ne trouvez pas un export ? Il a peut-être expiré, les exports sont supprimés au bout de %{expiration_time} heures.