design : make filter buttons tertiary and dropdown secondary
This commit is contained in:
parent
06c6a4ab0c
commit
db3085fa33
6 changed files with 8 additions and 8 deletions
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
.dropdown{ data: { controller: 'menu-button', popover: 'true' } }
|
.dropdown{ data: { controller: 'menu-button', popover: 'true' } }
|
||||||
-# Dropdown button title
|
-# Dropdown button title
|
||||||
%button.fr-btn.fr-btn--sm.fr-ml-1w.dropdown-button{ disabled: true, data: { menu_button_target: 'button', batch_operation_target: 'menu' } }
|
%button.fr-btn.fr-btn--sm.fr-btn--secondary.fr-ml-1w.dropdown-button{ disabled: true, data: { menu_button_target: 'button', batch_operation_target: 'menu' } }
|
||||||
Autres actions multiples
|
Autres actions multiples
|
||||||
|
|
||||||
#state-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
|
#state-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
class Dossiers::ExportComponent < ApplicationComponent
|
class Dossiers::ExportComponent < ApplicationComponent
|
||||||
def initialize(procedure:, exports:, statut: nil, count: nil, export_url: nil)
|
def initialize(procedure:, exports:, statut: nil, count: nil, class_btn: nil, export_url: nil)
|
||||||
@procedure = procedure
|
@procedure = procedure
|
||||||
@exports = exports
|
@exports = exports
|
||||||
@statut = statut
|
@statut = statut
|
||||||
@count = count
|
@count = count
|
||||||
|
@class_btn = class_btn
|
||||||
@export_url = export_url
|
@export_url = export_url
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
%span.dropdown{ data: { controller: 'menu-button' } }
|
%span.dropdown{ data: { controller: 'menu-button' } }
|
||||||
%button.fr-btn.fr-btn--secondary.fr-btn--sm.dropdown-button{ data: { menu_button_target: 'button' } }
|
%button.fr-btn.fr-btn--sm.dropdown-button{ data: { menu_button_target: 'button' }, class: @class_btn.present? ? @class_btn : 'fr-btn--secondary' }
|
||||||
- if @count.nil?
|
- if @count.nil?
|
||||||
= t(".download_all")
|
= t(".download_all")
|
||||||
- else
|
- else
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
%span.dropdown{ data: { controller: 'menu-button', popover: 'true' } }
|
%span.dropdown{ data: { controller: 'menu-button', popover: 'true' } }
|
||||||
%button.fr-btn.fr-btn--secondary.fr-btn--sm.fr-mr-2w.dropdown-button{ data: { menu_button_target: 'button' } }
|
%button.fr-btn.fr-btn--tertiary.fr-btn--sm.fr-mr-2w.dropdown-button{ data: { menu_button_target: 'button' } }
|
||||||
= t('views.instructeurs.dossiers.filters.title')
|
= t('views.instructeurs.dossiers.filters.title')
|
||||||
#filter-menu.dropdown-content.left-aligned.fade-in-down{ data: { menu_button_target: 'menu' } }
|
#filter-menu.dropdown-content.left-aligned.fade-in-down{ data: { menu_button_target: 'menu' } }
|
||||||
= render Dossiers::FilterComponent.new(procedure: procedure, procedure_presentation: @procedure_presentation, statut: statut)
|
= render Dossiers::FilterComponent.new(procedure: procedure, procedure_presentation: @procedure_presentation, statut: statut)
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
|
|
||||||
.fr-ml-auto
|
.fr-ml-auto
|
||||||
%span.dropdown{ data: { controller: 'menu-button', popover: 'true' } }
|
%span.dropdown{ data: { controller: 'menu-button', popover: 'true' } }
|
||||||
%button.fr-btn.fr-btn--sm.fr-btn--secondary.dropdown-button.fr-ml-1w{ data: { menu_button_target: 'button' } }
|
%button.fr-btn.fr-btn--sm.fr-btn--tertiary.dropdown-button.fr-ml-1w{ data: { menu_button_target: 'button' } }
|
||||||
= t('views.instructeurs.dossiers.personalize')
|
= t('views.instructeurs.dossiers.personalize')
|
||||||
#custom-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
|
#custom-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
|
||||||
= form_tag update_displayed_fields_instructeur_procedure_path(@procedure), method: :patch, class: 'dropdown-form large columns-form' do
|
= form_tag update_displayed_fields_instructeur_procedure_path(@procedure), method: :patch, class: 'dropdown-form large columns-form' do
|
||||||
|
@ -85,7 +85,7 @@
|
||||||
|
|
||||||
- if @dossiers_count > 0
|
- if @dossiers_count > 0
|
||||||
%span.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))
|
= render Dossiers::ExportComponent.new(procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count, class_btn: 'fr-btn--tertiary', export_url: method(:download_export_instructeur_procedure_path))
|
||||||
|
|
||||||
- if @filtered_sorted_paginated_ids.present? || @current_filters.count > 0
|
- if @filtered_sorted_paginated_ids.present? || @current_filters.count > 0
|
||||||
= render partial: "dossiers_filter_tags", locals: { procedure: @procedure, procedure_presentation: @procedure_presentation, current_filters: @current_filters, statut: @statut }
|
= render partial: "dossiers_filter_tags", locals: { procedure: @procedure, procedure_presentation: @procedure_presentation, current_filters: @current_filters, statut: @statut }
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
= render Dossiers::BatchAlertComponent.new(batch: batch_operation, procedure: @procedure)
|
= render Dossiers::BatchAlertComponent.new(batch: batch_operation, procedure: @procedure)
|
||||||
|
|
||||||
%div{ data: batch_operation_component.render? ? { controller: 'batch-operation' } : {} }
|
%div{ data: batch_operation_component.render? ? { controller: 'batch-operation' } : {} }
|
||||||
.flex.align-center
|
.flex.align-center.fr-mt-2w
|
||||||
%span.fr-h6.fr-mb-0.fr-mr-2w
|
%span.fr-h6.fr-mb-0.fr-mr-2w
|
||||||
= t('views.instructeurs.dossiers.dossiers_count', count: @dossiers_count)
|
= t('views.instructeurs.dossiers.dossiers_count', count: @dossiers_count)
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,6 @@ describe BatchOperationProcessOneJob, type: :job do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
context 'when operation is "repasser en construction"' do
|
context 'when operation is "repasser en construction"' do
|
||||||
let(:batch_operation) do
|
let(:batch_operation) do
|
||||||
create(:batch_operation, :repasser_en_construction,
|
create(:batch_operation, :repasser_en_construction,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue