8000 more fields + fix checkbox · symfony/symfony@557fba4 · GitHub
[go: up one dir, main page]

Skip to content

Commit 557fba4

Browse files
committed
more fields + fix checkbox
1 parent 6704788 commit 557fba4

File tree

1 file changed

+42
-8
lines changed

1 file changed

+42
-8
lines changed

src/Symfony/Bridge/Twig/Resources/views/Form/daisyui_5_layout.html.twig

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{%- endblock form_help -%}
1717

1818
{%- block form_label -%}
19-
{%- set label_attr = label_attr|merge({ class: label_attr.class|default(label_class|default('label mb-2')) }) -%}
19+
{%- set label_attr = label_attr|merge({ class: label_attr.class|default(label_class|default('label')) }) -%}
2020
{{- parent() -}}
2121
{%- endblock form_label -%}
2222

@@ -30,29 +30,63 @@
3030
{{- parent() -}}
3131
{%- endblock submit_widget %}
3232

33+
{%- block choice_widget_expanded -%}
34+
{%- set attr = attr|merge({ class: attr.class|default('mt-2') }) -%}
35+
<div {{ block('widget_container_attributes') }}>
36+
{%- for child in form %}
37+
<label class="flex items-center label mb-2">
38+
{{- form_widget(child) -}}
39+
{{- block('form_label_content') -}}
40+
</label>
41+
{% endfor -%}
42+
</div>
43+
{%- endblock choice_widget_expanded -%}
44+
45+
{%- block checkbox_row -%}
46+
{%- set row_attr = row_attr|merge({ class: row_attr.class|default(row_class|default('mb-6')) }) -%}
47+
{%- set widget_attr = {} -%}
48+
{%- if help is not empty -%}
49+
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
50+
{%- endif -%}
51+
<div{% with {attr: row_attr} %}{{ block('attributes') }}{% endwith %}>
52+
{{- form_errors(form) -}}
53+
<label class="flex items-center label mb-2">
54+
{{- form_widget(form, widget_attr) -}}
55+
{{- block('form_label_content') -}}
56+
</label>
57+
{{- form_help(form) -}}
58+
</div>
59+
{%- endblock checkbox_row -%}
60+
3361
{%- block checkbox_widget -%}
34-
{%- set widget_class = widget_class|default('checkbox mr-2') -%}
62+
{%- set widget_class = widget_class|default('checkbox') -%}
3563
{{- parent() -}}
3664
{%- endblock checkbox_widget -%}
3765

3866
{% block radio_widget -%}
39-
{%- set attr_class = attr_class|default(attr.class|default('')) -%}
40-
{%- set attr_class = attr_class ~ ' radio' -%}
67+
{%- set widget_class = widget_class|default('radio') -%}
68+
{{- parent() -}}
4169
{%- endblock radio_widget %}
4270

4371
{%- block choice_widget_collapsed -%}
44-
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' select')|trim}) -%}
72+
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' select mt-2')|trim}) -%}
4573
{{- parent() -}}
4674
{%- endblock choice_widget_collapsed -%}
4775

4876
{% block textarea_widget -%}
49-
{% set attr = attr|merge({class: (attr.class|default('') ~ ' textarea')|trim}) %}
77+
{% set attr = attr|merge({class: (attr.class|default('') ~ ' textarea mt-2')|trim}) %}
5078
{{- parent() -}}
5179
{%- endblock textarea_widget %}
5280

81+
{%- block range_widget -%}
82+
{% set type = type|default('range') %}
83+
{%- set widget_class = widget_class|default('range mt-2') -%}
84+
{{- block('form_widget_simple') -}}
85+
{%- endblock range_widget %}
86+
5387
{% block form_widget_simple -%}
54-
{%- if type is not defined or type != 'hidden' %}
55-
{%- set widget_class = ' input' %}
88+
{%- if type is not defined or type not in ['hidden', 'range'] %}
89+
{%- set widget_class = ' input mt-2' %}
5690
{%- set attr = attr|merge({class: (attr.class|default('') ~ widget_class)|trim}) -%}
5791
{% endif -%}
5892

0 commit comments

Comments
 (0)
0