X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/b8024b225dacfeb78cdc7bb6277db8d568a608e1..1e03b9bca33c3457074335594854a508592e5657:/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 34af91e..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 -%}
@@ -308,7 +318,7 @@
 {%- endblock form_row -%}
 
 {%- block button_row -%}
-    <div>
+    <div class="row">
         {{- form_widget(form) -}}
     </div>
 {%- endblock button_row -%}