change wording in usager filter and target css to combobox component
This commit is contained in:
parent
9c26d8486f
commit
e2d83d87d2
6 changed files with 9 additions and 9 deletions
|
@ -37,6 +37,7 @@ trix-editor.fr-input {
|
|||
|
||||
.fr-menu__list {
|
||||
width: 100%;
|
||||
max-height: 300px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -656,7 +656,6 @@ textarea::placeholder {
|
|||
.fr-menu__list {
|
||||
padding: $default-spacer;
|
||||
overflow-y: auto;
|
||||
max-height: 300px;
|
||||
|
||||
.fr-menu__item {
|
||||
list-style-type: none;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
en:
|
||||
legend:
|
||||
state: States
|
||||
created_at: Creation date since
|
||||
depose_at: Submission date since
|
||||
created_at: Created since
|
||||
depose_at: Submitted since
|
||||
button:
|
||||
apply_filters: Apply filters
|
||||
reset_filters: Reset filters
|
||||
cancel_filters: Cancel
|
||||
select_filters: Select a filter
|
||||
tag:
|
||||
active_filters:
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
fr:
|
||||
legend:
|
||||
state: Statut
|
||||
created_at: Date de création depuis le
|
||||
depose_at: Date de dépôt depuis le
|
||||
created_at: Créé depuis le
|
||||
depose_at: Déposé depuis le
|
||||
button:
|
||||
apply_filters: Appliquer les filtres
|
||||
reset_filters: Réinitialiser les filtres
|
||||
cancel_filters: Annuler
|
||||
select_filters: Sélectionner un filtre
|
||||
tag:
|
||||
active_filters:
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
.fr-my-2w
|
||||
= f.submit t('.button.apply_filters'), class: 'fr-btn fr-btn--sm'
|
||||
= link_to t('.button.reset_filters'), dossiers_path(statut: @statut), class: 'fr-btn fr-btn--sm fr-btn--tertiary-no-outline'
|
||||
= link_to t('.button.cancel_filters'), dossiers_path(statut: @statut), class: 'fr-btn fr-btn--sm fr-btn--tertiary-no-outline'
|
||||
|
||||
- if @filter.filter_params.present?
|
||||
.fr-col-12.text-right
|
||||
|
|
|
@ -104,7 +104,7 @@ describe 'user access to the list of their dossiers', js: true do
|
|||
expect(page).to have_select 'Statut', selected: 'Refusé', options: ['Sélectionner un statut', 'Accepté', 'Refusé', 'Classé sans suite']
|
||||
|
||||
click_on('Sélectionner un filtre')
|
||||
click_on('Réinitialiser les filtres')
|
||||
click_on('Annuler')
|
||||
expect(page).to have_text('2 sur 2 dossiers')
|
||||
expect(page).to have_select 'Statut', selected: 'Sélectionner un statut', options: ['Sélectionner un statut', 'Accepté', 'Refusé', 'Classé sans suite']
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue