X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/f110b8ba20232e0ceeb67390f8e672431868d32d..b603574e4355dac6e0a75d5bffd3c027ad19704d:/Resources/views/form/form_div_layout.html.twig diff --git a/Resources/views/form/form_div_layout.html.twig b/Resources/views/form/form_div_layout.html.twig index 7f73c51..61c8a03 100644 --- a/Resources/views/form/form_div_layout.html.twig +++ b/Resources/views/form/form_div_layout.html.twig @@ -43,12 +43,14 @@ {%- endblock choice_widget -%} {%- block choice_widget_expanded -%} -
{%- for child in form %} - {{- form_widget(child) -}} - {{- form_label(child, null, {translation_domain: choice_translation_domain}) -}} +
+ {{- form_label(child, null, {translation_domain: choice_translation_domain}) -}} +
+ {{- form_widget(child) -}} +
+
{% endfor -%} -
{%- endblock choice_widget_expanded -%} {%- block choice_widget_collapsed -%} @@ -273,9 +275,17 @@ {%- endif -%} <{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}> {%- if translation_domain is same as(false) -%} - {{- label -}} + {%- if label_html is same as(false) -%} + {{- label -}} + {%- else -%} + {{- label|raw -}} + {%- endif -%} {%- else -%} - {{- label|trans({}, translation_domain) -}} + {%- if label_html is same as(false) -%} + {{- label|trans({}, translation_domain) -}} + {%- else -%} + {{- label|trans({}, translation_domain)|raw -}} + {%- endif -%} {%- endif -%} {%- endif -%} @@ -294,21 +304,21 @@ {%- endblock repeated_row -%} {%- block form_row -%} -
+
{{- form_label(form) -}} -
+
{{- form_widget(form) -}} {%- if errors|length > 0 -%} -
+
{{- form_errors(form) -}}
{%- endif -%} -
+
{%- endblock form_row -%} {%- block button_row -%} -
+
{{- form_widget(form) -}}
{%- endblock button_row -%} @@ -337,6 +347,11 @@ {%- if form_method != method -%} {%- endif -%} + {%- if errors|length > 0 -%} +
+ {{- form_errors(form) -}} +
+ {%- endif -%} {%- endblock form_start -%} {%- block form_end -%}