|
16 | 16 | {%- endblock form_help -%} |
17 | 17 |
|
18 | 18 | {%- 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')) }) -%} |
20 | 20 | {{- parent() -}} |
21 | 21 | {%- endblock form_label -%} |
22 | 22 |
|
|
30 | 30 | {{- parent() -}} |
31 | 31 | {%- endblock submit_widget %} |
32 | 32 |
|
| 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 | + |
33 | 61 | {%- block checkbox_widget -%} |
34 | | - {%- set widget_class = widget_class|default('checkbox mr-2') -%} |
| 62 | + {%- set widget_class = widget_class|default('checkbox') -%} |
35 | 63 | {{- parent() -}} |
36 | 64 | {%- endblock checkbox_widget -%} |
37 | 65 |
|
38 | 66 | {% 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() -}} |
41 | 69 | {%- endblock radio_widget %} |
42 | 70 |
|
43 | 71 | {%- 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}) -%} |
45 | 73 | {{- parent() -}} |
46 | 74 | {%- endblock choice_widget_collapsed -%} |
47 | 75 |
|
48 | 76 | {% 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}) %} |
50 | 78 | {{- parent() -}} |
51 | 79 | {%- endblock textarea_widget %} |
52 | 80 |
|
| 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 | + |
53 | 87 | {% 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' %} |
56 | 90 | {%- set attr = attr|merge({class: (attr.class|default('') ~ widget_class)|trim}) -%} |
57 | 91 | {% endif -%} |
58 | 92 |
|
|
0 commit comments