Replace dropped calls with checker, factory and security replacements

[airbundle] / 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 dfc79b3eb5494c83c801b2145eabcf186ff2f456..61c8a03593e14762c9146b2644621fce9f6624c7 100644 (file)
--- 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 -%}
 {%- endblock choice_widget -%}
 
 {%- block choice_widget_expanded -%}

-    <div {{ block('widget_container_attributes') }}>

     {%- for child in form %}
     {%- 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 -%}
     {% endfor -%}

-    </div>

 {%- endblock choice_widget_expanded -%}
 
 {%- block choice_widget_collapsed -%}
 {%- 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) -%}
         {%- 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 -%}
             {%- 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 -%}
             {%- endif -%}
         </{{ element|default('label') }}>
     {%- endif -%}


@@ -294,21 +304,21 @@
 {%- endblock repeated_row -%}
 
 {%- block form_row -%}
 {%- endblock repeated_row -%}
 
 {%- block form_row -%}

-    <div>
+    <div class="row">

         {{- form_label(form) -}}
         {{- form_label(form) -}}

-        <section>
+        <div>

             {{- form_widget(form) -}}
             {%- if errors|length > 0 -%}
             {{- form_widget(form) -}}
             {%- if errors|length > 0 -%}

-                <div class="error">
+                <div class="message error">

                     {{- form_errors(form) -}}
                 </div>
             {%- endif -%}
                     {{- form_errors(form) -}}
                 </div>
             {%- endif -%}

-        </section>
+        </div>

     </div>
 {%- endblock form_row -%}
 
 {%- block button_row -%}
     </div>
 {%- endblock form_row -%}
 
 {%- block button_row -%}

-    <div>
+    <div class="row">

         {{- form_widget(form) -}}
     </div>
 {%- endblock button_row -%}
         {{- form_widget(form) -}}
     </div>
 {%- endblock button_row -%}


@@ -338,10 +348,8 @@
         <input type="hidden" name="_method" value="{{ method }}" />
     {%- endif -%}
     {%- if errors|length > 0 -%}
         <input type="hidden" name="_method" value="{{ method }}" />
     {%- endif -%}
     {%- if errors|length > 0 -%}

-        <header>
-            <div class="error">
-                {{- form_errors(form) -}}
-            </div>
+        <header class="message error">
+                       {{- form_errors(form) -}}

         </header>
     {%- endif -%}
 {%- endblock form_start -%}
         </header>
     {%- endif -%}
 {%- endblock form_start -%}