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

fix(Champ.checkbox): single checkbox should not be wrapped in fieldset. single checkbox uses fr-checkbox not fr-radio

Browse source 
Co-authored-by: Corinne Durrmeyer <corinne@inseo.fr>
This commit is contained in:
mfo 2024-04-09 17:02:08 +02:00
parent 64dcd2b0d2
commit 91f07f86e4
No known key found for this signature in database
GPG key ID: 7CE3E1F5B794A8EC
5 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/editable_champ/checkbox_component.rb
View file

@ -1,9 +1,5 @@
class EditableChamp::CheckboxComponent < EditableChamp::EditableChampBaseComponent class EditableChamp::CheckboxComponent < EditableChamp::EditableChampBaseComponent
def dsfr_champ_container
:fieldset
end
def dsfr_input_classname def dsfr_input_classname
'fr-radio' 'fr-checkbox'
end end
end end

1
app/components/editable_champ/checkbox_component/checkbox_component.html.haml
View file

@ -1,4 +1,3 @@
.fr-fieldset__element
.fr-checkbox-group .fr-checkbox-group
= @form.check_box :value, = @form.check_box :value,
{ required: @champ.required?, id: @champ.input_id, checked: @champ.true?, aria: { describedby: @champ.describedby_id }, class: class_names('required' => @champ.required?)}, { required: @champ.required?, id: @champ.input_id, checked: @champ.true?, aria: { describedby: @champ.describedby_id }, class: class_names('required' => @champ.required?)},

1
app/components/editable_champ/section_component/section_component.html.haml
View file

@ -10,7 +10,6 @@
= fields_for champ.input_name, champ do |form| = fields_for champ.input_name, champ do |form|
= render EditableChamp::EditableChampComponent.new form:, champ: = render EditableChamp::EditableChampComponent.new form:, champ:
- else - else
.fr-fieldset__element.fr-my-0
- if header_section - if header_section
.fr-fieldset__legend.fr-my-0{ class: "reset-#{tag_for_depth}" } .fr-fieldset__legend.fr-my-0{ class: "reset-#{tag_for_depth}" }
= render EditableChamp::HeaderSectionComponent.new(champ: header_section) = render EditableChamp::HeaderSectionComponent.new(champ: header_section)

2
app/views/shared/dossiers/_edit.html.haml
View file

@ -21,7 +21,7 @@
= render Procedure::NoticeComponent.new(procedure: dossier.procedure) = render Procedure::NoticeComponent.new(procedure: dossier.procedure)
= render EditableChamp::SectionComponent.new(dossier: dossier_for_editing, types_de_champ: dossier_for_editing.revision.types_de_champ_public) %fieldset.fr-fieldset= render EditableChamp::SectionComponent.new(dossier: dossier_for_editing, types_de_champ: dossier_for_editing.revision.types_de_champ_public)
= render Dossiers::PendingCorrectionCheckboxComponent.new(dossier: dossier) = render Dossiers::PendingCorrectionCheckboxComponent.new(dossier: dossier)

2
app/views/shared/dossiers/_edit_annotations.html.haml
View file

@ -3,7 +3,7 @@
%section.counter-start-header-section %section.counter-start-header-section
= render NestedForms::FormOwnerComponent.new = render NestedForms::FormOwnerComponent.new
= form_for dossier, url: annotations_instructeur_dossier_path(dossier.procedure, dossier), html: { class: 'form', multipart: true } do |f| = form_for dossier, url: annotations_instructeur_dossier_path(dossier.procedure, dossier), html: { class: 'form', multipart: true } do |f|
= render EditableChamp::SectionComponent.new(dossier:, types_de_champ: dossier.revision.types_de_champ_private) %fieldset.fr-fieldset= render EditableChamp::SectionComponent.new(dossier:, types_de_champ: dossier.revision.types_de_champ_private)
= render Dossiers::EditFooterComponent.new(dossier: dossier, annotation: true) = render Dossiers::EditFooterComponent.new(dossier: dossier, annotation: true)
- else - else