Merge pull request #8314 from colinux/style-instructeurs-dossiers-header

style(instructeurs): improve dossier header layout

app/assets/stylesheets/procedure_show.scss

@@ -34,11 +34,6 @@
     }
   }
 
-  .afficher-dossiers-supprimes {
-    display: flex;
-    justify-content: flex-end;
-  }
-
   .filter {
     display: inline-block;
     padding-left: 10px;
@@ -106,6 +101,6 @@
 
   // fix/dsfr
   .fr-checkbox-group.fix-dsfr-notified-toggle-component {
-    margin-top: -7px;
+    margin-top: -0.5rem;
   }
 }

app/views/instructeurs/procedures/show.html.haml

@@ -50,23 +50,27 @@
           = "(#{@procedure.duree_conservation_dossiers_dans_ds} mois)"
         sera expiré.
         = link_to 'En savoir plus', ARCHIVAGE_DOC_URL
-      .afficher-dossiers-supprimes
-        = link_to deleted_dossiers_instructeur_procedure_path(@procedure) do
-          %span.icon.delete
-          Afficher les dossiers supprimés
     - if @statut == 'expirant'
       %p.explication-onglet
         = t('views.instructeurs.dossiers.tab_explainations.expirant')
-    - if @filtered_sorted_paginated_ids.present? || @current_filters.count > 0
-      .flex
-        .flex-grow
+
+    .flex
+      - if @filtered_sorted_paginated_ids.present? || @current_filters.count > 0
+        %div
           = render partial: "dossiers_filter", locals: { procedure: @procedure, procedure_presentation: @procedure_presentation, current_filters: @current_filters, statut: @statut, filterable_fields_for_select: @filterable_fields_for_select }
-        .flex-grow
+        .fr-ml-2w
           = render Dossiers::NotifiedToggleComponent.new(procedure: @procedure, procedure_presentation: @procedure_presentation)
+
+      .flex-grow.text-right
+        - if @statut == 'archives'
+          = link_to deleted_dossiers_instructeur_procedure_path(@procedure), class: "fr-link fr-icon-delete-line fr-link--icon-left fr-mr-2w" do
+            = t('views.instructeurs.dossiers.show_deleted_dossiers')
+
         - if @dossiers_count > 0
-          .dossiers-export
+          %span.dossiers-export
             = render Dossiers::ExportComponent.new(procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count, export_url: method(:download_export_instructeur_procedure_path))
 
+    - if @filtered_sorted_paginated_ids.present? || @current_filters.count > 0
       - batch_operation_component = Dossiers::BatchOperationComponent.new(statut: @statut, procedure: @procedure)
       %div{ data: batch_operation_component.render? ? { controller: 'batch-operation' } : {} }
 

config/locales/en.yml

@@ -216,6 +216,7 @@ en:
           enabled: "Add this file to the selection for the bulk operation"
           disabled: "Impossible to add this file to the selection because it is already in a bulk operation"
         personalize: Personalize
+        show_deleted_dossiers: Show deleted files
         follow_file: Follow-up the file
         save: Save
         stop_follow: No longer follow

config/locales/fr.yml

@@ -208,6 +208,7 @@ fr:
         batch_operation:
           enabled: "Ajouter ce dossier à la selection pour un traitement de masse"
           disabled: "Impossible d'ajouter ce dossier à la selection car il est déjà dans un traitement de masse"
+        show_deleted_dossiers: Afficher les dossiers supprimés
         personalize: Personnaliser
         download: Télécharger un dossier
         follow_file: Suivre le dossier