diff --git a/app/assets/stylesheets/dossiers_table.scss b/app/assets/stylesheets/dossiers_table.scss index 4f903da50..1ea907f69 100644 --- a/app/assets/stylesheets/dossiers_table.scss +++ b/app/assets/stylesheets/dossiers_table.scss @@ -62,11 +62,6 @@ width: 110px; } - .action-col { - text-align: right; - padding-left: $default-spacer; - padding-right: $default-spacer; - } .follow-col { width: 450px; diff --git a/app/components/dossiers/notified_toggle_component/notified_toggle_component.html.haml b/app/components/dossiers/notified_toggle_component/notified_toggle_component.html.haml index 53da63089..c1edbf03a 100644 --- a/app/components/dossiers/notified_toggle_component/notified_toggle_component.html.haml +++ b/app/components/dossiers/notified_toggle_component/notified_toggle_component.html.haml @@ -1,5 +1,5 @@ = form_tag update_sort_instructeur_procedure_path(procedure_id: @procedure.id, table: 'notifications', column: 'notifications', order: opposite_order), method: :get, data: { controller: 'autosubmit' } do .fr-toggle = check_box_tag :order, opposite_order, active?, class: 'fr-toggle__input' - = label_tag :order, t('.show_notified_first'), class: 'fr-toggle__label fr-pl-1w' + = label_tag :order, t('.show_notified_first'), class: 'fr-toggle__label' = submit_tag t('.show_notified_first'), data: {"checkbox-target": 'submit' }, class: 'visually-hidden' diff --git a/app/views/instructeurs/procedures/show.html.haml b/app/views/instructeurs/procedures/show.html.haml index 6c39ff86a..5c336acf7 100644 --- a/app/views/instructeurs/procedures/show.html.haml +++ b/app/views/instructeurs/procedures/show.html.haml @@ -65,23 +65,7 @@ = render Dossiers::NotifiedToggleComponent.new(procedure: @procedure, procedure_presentation: @procedure_presentation) .fr-ml-auto - = render Dropdown::MenuComponent.new(wrapper: :span, button_options: { class: ['fr-btn--sm', 'fr-btn--secondary'] }, menu_options: { id: 'custom-menu' }) do |menu| - - menu.with_button_inner_html do - = t('views.instructeurs.dossiers.personalize') - - menu.with_form do - = form_tag update_displayed_fields_instructeur_procedure_path(@procedure), method: :patch, class: 'dropdown-form large columns-form' do - = hidden_field_tag :values, nil - = react_component("ComboMultiple", - options: @displayable_fields_for_select, - selected: @displayable_fields_selected, - disabled: [], - label: 'Colonne à afficher', - group: '.columns-form', - name: 'values') - = submit_tag t('views.instructeurs.dossiers.save'), class: 'fr-btn fr-btn--secondary' - - .fr-ml-2w - 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') @@ -122,10 +106,26 @@ - @procedure_presentation.displayed_fields_for_headers.each do |field| = render partial: "header_field", locals: { field: field, classname: field['classname'] } - %th.action-col.follow-col + %th.follow-col Actions - %tr + %th.text-right + = render Dropdown::MenuComponent.new(wrapper: :span, button_options: { class: ['fr-btn--sm', 'fr-btn--tertiary-no-outline', 'fr-btn--icon-right', 'fr-icon-settings-5-line'] }, menu_options: { id: 'custom-menu' }) do |menu| + - menu.with_button_inner_html do + = t('views.instructeurs.dossiers.personalize') + - menu.with_form do + = form_tag update_displayed_fields_instructeur_procedure_path(@procedure), method: :patch, class: 'dropdown-form large columns-form' do + = hidden_field_tag :values, nil + = react_component("ComboMultiple", + options: @displayable_fields_for_select, + selected: @displayable_fields_selected, + disabled: [], + label: 'Colonne à afficher', + group: '.columns-form', + name: 'values') + + = submit_tag t('views.instructeurs.dossiers.save'), class: 'fr-btn fr-btn--secondary' + %tbody = render Dossiers::BatchSelectMoreComponent.new(dossiers_count: @dossiers_count, filtered_sorted_ids: @filtered_sorted_ids) @@ -179,7 +179,7 @@ %span.cell-link = link_to_if p.hidden_by_administration_at.blank?, render(Instructeurs::SVASVRDecisionBadgeComponent.new(projection_or_dossier: p, procedure: @procedure)), path - %td.action-col.follow-col + %td.follow-col{colspan:'2'} %ul.inline.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline.fr-btns-group--icon-right = render partial: 'instructeurs/procedures/dossier_actions', locals: { procedure_id: @procedure.id, dossier_id: p.dossier_id, @@ -191,6 +191,7 @@ sva_svr: @procedure.sva_svr_enabled?, turbo: false, with_menu: false } + %tfoot %tr %td.force-table-100{ colspan: @procedure_presentation.displayed_fields_for_headers.size + 2 } diff --git a/app/views/recherche/index.html.haml b/app/views/recherche/index.html.haml index ff17ddc37..3e652405d 100644 --- a/app/views/recherche/index.html.haml +++ b/app/views/recherche/index.html.haml @@ -21,7 +21,7 @@ %th Démarche %th Demandeur %th.status-col Statut - %th.action-col.follow-col + %th.follow-col %tbody - @projected_dossiers.each do |p| - procedure_libelle, user_email, procedure_id = p.columns @@ -67,7 +67,7 @@ - if instructeur_dossier && expert_dossier - %td.action-col.follow-col + %td.follow-col = render Dropdown::MenuComponent.new(wrapper: :div, button_options: {class: ['fr-btn--sm']}) do |menu| - menu.with_button_inner_html do Actions @@ -86,12 +86,12 @@ - elsif instructeur_dossier - if hidden_by_administration - %td.action-col.follow-col + %td.follow-col = link_to restore_instructeur_dossier_path(procedure_id, p.dossier_id), method: :patch, class: "button primary" do = t('views.instructeurs.dossiers.restore') - else - %td.action-col.follow-col + %td.follow-col %ul.inline.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline.fr-btns-group--icon-right = render partial: "instructeurs/procedures/dossier_actions", locals: { procedure_id: procedure_id, diff --git a/config/locales/en.yml b/config/locales/en.yml index 1e2c09f69..e206efedc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -380,7 +380,7 @@ en: batch_operation: enabled: "Add file %{dossier_id} to the selection for the bulk operation" disabled: "Impossible to add file %{dossier_id} to the selection because it is already in a bulk operation" - personalize: Personalize the table + personalize: Personalize show_deleted_dossiers: Show deleted files follow_file: Follow-up the file save: Save diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 17f86bfc0..1b64c62dc 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -383,7 +383,7 @@ fr: enabled: "Ajouter le dossier %{dossier_id} à la sélection pour un traitement de masse" disabled: "Impossible d'ajouter le dossier %{dossier_id} à la selection car il est déjà dans un traitement de masse" show_deleted_dossiers: Afficher les dossiers supprimés - personalize: Personnaliser le tableau + personalize: Personnaliser download: Télécharger un dossier follow_file: Suivre le dossier stop_follow: Ne plus suivre