DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

change wording in usager filter and target css to combobox component

Browse source
This commit is contained in:
Lisa Durand 2024-04-08 10:22:23 +02:00
parent 9c26d8486f
commit e2d83d87d2
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/dsfr.scss
View file

@ -37,6 +37,7 @@ trix-editor.fr-input {
.fr-menu__list { .fr-menu__list {
width: 100%; width: 100%;
max-height: 300px;
} }
} }

1
app/assets/stylesheets/forms.scss
View file

@ -656,7 +656,6 @@ textarea::placeholder {
.fr-menu__list { .fr-menu__list {
padding: $default-spacer; padding: $default-spacer;
overflow-y: auto; overflow-y: auto;
max-height: 300px;
.fr-menu__item { .fr-menu__item {
list-style-type: none; list-style-type: none;

6
app/components/dossiers/user_filter_component/user_filter_component.en.yml
View file

@ -1,11 +1,11 @@
en: en:
legend: legend:
state: States state: States
created_at: Creation date since created_at: Created since
depose_at: Submission date since depose_at: Submitted since
button: button:
apply_filters: Apply filters apply_filters: Apply filters
reset_filters: Reset filters cancel_filters: Cancel
select_filters: Select a filter select_filters: Select a filter
tag: tag:
active_filters: active_filters:

6
app/components/dossiers/user_filter_component/user_filter_component.fr.yml
View file

@ -1,11 +1,11 @@
fr: fr:
legend: legend:
state: Statut state: Statut
created_at: Date de création depuis le created_at: Créé depuis le
depose_at: Date de dépôt depuis le depose_at: Déposé depuis le
button: button:
apply_filters: Appliquer les filtres apply_filters: Appliquer les filtres
reset_filters: Réinitialiser les filtres cancel_filters: Annuler
select_filters: Sélectionner un filtre select_filters: Sélectionner un filtre
tag: tag:
active_filters: active_filters:

2
app/components/dossiers/user_filter_component/user_filter_component.html.haml
View file

@ -25,7 +25,7 @@
.fr-my-2w .fr-my-2w
= f.submit t('.button.apply_filters'), class: 'fr-btn fr-btn--sm' = 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? - if @filter.filter_params.present?
.fr-col-12.text-right .fr-col-12.text-right

2
spec/system/users/list_dossiers_spec.rb
View file

@ -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'] 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('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_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'] expect(page).to have_select 'Statut', selected: 'Sélectionner un statut', options: ['Sélectionner un statut', 'Accepté', 'Refusé', 'Classé sans suite']
end end