X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/f110b8ba20232e0ceeb67390f8e672431868d32d..bd5a79b1bc48da095aabd20b273a423fbd1ee485:/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..9270f0e 100644
--- a/Resources/views/form/form_div_layout.html.twig
+++ b/Resources/views/form/form_div_layout.html.twig
@@ -273,9 +273,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,16 +302,16 @@
 {%- 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 -%}
 
@@ -337,6 +345,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 -%}