X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/f110b8ba20232e0ceeb67390f8e672431868d32d..578d9c40c478fb956228ac45e8aa325bd8aecbb6:/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 -%}
-    <div {{ block('widget_container_attributes') }}>
     {%- for child in form %}
-        {{- form_widget(child) -}}
-        {{- form_label(child, null, {translation_domain: choice_translation_domain}) -}}
+		<div class="row" {{ block('widget_container_attributes') }}>
+			{{- form_label(child, null, {translation_domain: choice_translation_domain}) -}}
+			<div>
+				{{- form_widget(child) -}}
+			</div>
+		</div>
     {% endfor -%}
-    </div>
 {%- 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 -%}
         </{{ element|default('label') }}>
     {%- endif -%}
@@ -294,21 +304,21 @@
 {%- endblock repeated_row -%}
 
 {%- block form_row -%}
-    <div>
+    <div class="row">
         {{- form_label(form) -}}
-        <section>
+        <div>
             {{- form_widget(form) -}}
             {%- if errors|length > 0 -%}
-                <div class="error">
+                <div class="message error">
                     {{- form_errors(form) -}}
                 </div>
             {%- endif -%}
-        </section>
+        </div>
     </div>
 {%- endblock form_row -%}
 
 {%- block button_row -%}
-    <div>
+    <div class="row">
         {{- form_widget(form) -}}
     </div>
 {%- endblock button_row -%}
@@ -337,6 +347,11 @@
     {%- if form_method != method -%}
         <input type="hidden" name="_method" value="{{ method }}" />
     {%- endif -%}
+    {%- if errors|length > 0 -%}
+        <header class="message error">
+			{{- form_errors(form) -}}
+        </header>
+    {%- endif -%}
 {%- endblock form_start -%}
 
 {%- block form_end -%}