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

use DSFR classes for btn and form inside the dropdown

Browse source
This commit is contained in:
Lisa Durand 2023-02-28 16:01:50 +01:00
parent 7130ea7e99
commit 99c5a1f298
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@
%h4= opt[:label] %h4= opt[:label]
.motivation.accept .motivation.accept
= form.text_area :motivation, class: 'motivation-text-area' = form.text_area :motivation, class: 'fr-input'
#justificatif_motivation_suggest_accept.optional-justificatif #justificatif_motivation_suggest_accept.optional-justificatif
%button.button{ type: 'button', onclick: "DS.showImportJustificatif('accept');" } Ajouter un justificatif (optionnel) %button.button{ type: 'button', onclick: "DS.showImportJustificatif('accept');" } Ajouter un justificatif (optionnel)
#justificatif_motivation_import_accept.hidden #justificatif_motivation_import_accept.hidden

14
app/views/instructeurs/dossiers/_instruction_button_motivation.html.haml
View file

@ -1,7 +1,7 @@
.motivation.hidden{ class: popup_class } .motivation.hidden{ class: popup_class }
= form_tag(terminer_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo: true, turbo_confirm: confirm }, method: :post, multipart: true, class: 'form') do = form_tag(terminer_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo: true, turbo_confirm: confirm }, method: :post, multipart: true) do
- if title == 'Accepter' - if title == 'Accepter'
= text_area :dossier, :motivation, class: 'motivation-text-area', placeholder: placeholder, required: false = text_area :dossier, :motivation, class: 'fr-input', placeholder: placeholder, required: false
- if dossier.attestation_template&.activated? - if dossier.attestation_template&.activated?
%p.help %p.help
L’acceptation du dossier envoie automatiquement L’acceptation du dossier envoie automatiquement
@ -26,11 +26,11 @@
- unspecified_annotations_privees.each do |unspecified_annotations_privee| - unspecified_annotations_privees.each do |unspecified_annotations_privee|
%li= unspecified_annotations_privee.libelle %li= unspecified_annotations_privee.libelle
- else - else
= text_area :dossier, :motivation, class: 'motivation-text-area', placeholder: placeholder, required: true = text_area :dossier, :motivation, class: 'fr-input', placeholder: placeholder, required: true
.optional-justificatif{ id: "justificatif_motivation_suggest_#{popup_class}", onclick: "DS.showImportJustificatif('#{popup_class}');" } .optional-justificatif{ id: "justificatif_motivation_suggest_#{popup_class}", onclick: "DS.showImportJustificatif('#{popup_class}');" }
.button Ajouter un justificatif (optionnel) .fr-btn.fr-btn--tertiary-no-outline.fr-btn--icon-left.fr-icon-attachment-line.fr-ml-0 Ajouter un justificatif (optionnel)
.hidden{ id: "justificatif_motivation_import_#{popup_class}" } .hidden{ id: "justificatif_motivation_import_#{popup_class}" }
= file_field :dossier, :justificatif_motivation, direct_upload: true = file_field :dossier, :justificatif_motivation, direct_upload: true
.text-right .text-right.fr-mt-2w
%span.button{ onclick: 'DS.motivationCancel();' } Annuler %span.fr-btn.fr-btn--secondary{ onclick: 'DS.motivationCancel();' } Annuler
= button_tag 'Valider la décision', name: :process_action, value: process_action, class: 'button primary', title: title = button_tag 'Valider la décision', name: :process_action, value: process_action, class: 'fr-btn fr-mr-0', title: title