From 60105bcb72f132bb66dce5587f3553547b424027 Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 12:59:08 +0100 Subject: [PATCH 01/11] [TwigBridge] fix bootstrap 3 & 4 checkbow row rendering --- .../bootstrap_3_horizontal_layout.html.twig | 44 ++++++++++--------- .../views/Form/bootstrap_3_layout.html.twig | 9 +--- .../bootstrap_4_horizontal_layout.html.twig | 36 +++++++++------ 3 files changed, 49 insertions(+), 40 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig index 478de622da435..8b3a7499e35b1 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig @@ -1,5 +1,13 @@ {% use "bootstrap_3_layout.html.twig" %} +{% block form_label_class -%} +col-sm-2 +{%- endblock form_label_class %} + +{% block form_group_class -%} +col-sm-10 +{%- endblock form_group_class %} + {% block form_start -%} {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-horizontal')|trim}) %} {{- parent() -}} @@ -8,20 +16,14 @@ {# Labels #} {% block form_label -%} -{% spaceless %} {% if label is same as(false) %}
{% else %} - {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ block('form_label_class'))|trim}) %} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ block('form_label_class'))|trim}) -%} {{- parent() -}} {% endif %} -{% endspaceless %} {%- endblock form_label %} -{% block form_label_class -%} -col-sm-2 -{%- endblock form_label_class %} - {# Rows #} {% block form_row -%} @@ -35,27 +37,29 @@ col-sm-2 {%- endblock form_row %} {% block submit_row -%} -{% spaceless %} -
-
+
{#--#} +
{#--#}
{{ form_widget(form) }} -
+
{#--#}
-{% endspaceless %} {% endblock submit_row %} {% block reset_row -%} -{% spaceless %} -
-
+
{#--#} +
{#--#}
{{ form_widget(form) }} -
+
{#--#}
-{% endspaceless %} {% endblock reset_row %} -{% block form_group_class -%} -col-sm-10 -{%- endblock form_group_class %} +{% block checkbox_row -%} +
{#--#} +
{#--#} +
+ {{- form_widget(form) -}} + {{- form_errors(form) -}} +
{#--#} +
+{%- endblock checkbox_row %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig index 1601684b1a8fc..07ca81f5061ee 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig @@ -123,15 +123,10 @@ {%- endblock datetime_row %} {% block checkbox_row -%} -{% spaceless %}
-
-
- {{- form_widget(form) -}} - {{- form_errors(form) -}} -
+ {{- form_widget(form) -}} + {{- form_errors(form) -}}
-{% endspaceless %} {%- endblock checkbox_row %} {% block radio_row -%} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig index 32b4944bab3d0..8f62917d03080 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig @@ -1,5 +1,13 @@ {% use "bootstrap_4_layout.html.twig" %} +{% block form_label_class -%} +col-sm-2 +{%- endblock form_label_class %} + +{% block form_group_class -%} +col-sm-10 +{%- endblock form_group_class %} + {# Labels #} {% block form_label -%} @@ -14,10 +22,6 @@ {%- endif -%} {%- endblock form_label %} -{% block form_label_class -%} -col-sm-2 -{%- endblock form_label_class %} - {# Rows #} {% block form_row -%} @@ -47,23 +51,29 @@ col-sm-2 {%- endblock fieldset_form_row %} {% block submit_row -%} -
-
+
{#--#} +
{#--#}
{{- form_widget(form) -}} -
+
{#--#}
{%- endblock submit_row %} {% block reset_row -%} -
-
+
{#--#} +
{#--#}
{{- form_widget(form) -}} -
+
{#--#}
{%- endblock reset_row %} -{% block form_group_class -%} -col-sm-10 -{%- endblock form_group_class %} +{% block checkbox_row -%} +
{#--#} +
{#--#} +
+ {{- form_widget(form) -}} + {{- form_errors(form) -}} +
{#--#} +
+{%- endblock checkbox_row %} \ No newline at end of file From 1fd87b0216919709e81f48c86bf7fc61879ca015 Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 12:59:26 +0100 Subject: [PATCH 02/11] [TwigBridge] Add Bootstrap 3 & 4 checkbow row tests --- .../Tests/AbstractBootstrap3HorizontalLayoutTest.php | 9 +++++++++ .../Tests/AbstractBootstrap4HorizontalLayoutTest.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3HorizontalLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3HorizontalLayoutTest.php index 1273fa505bd2c..04b5b5836c650 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap3HorizontalLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap3HorizontalLayoutTest.php @@ -154,4 +154,13 @@ public function testStartTagWithExtraAttributes() $this->assertSame('
', $html); } + + public function testCheckboxRow() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType'); + $view = $form->createView(); + $html = $this->renderRow($view, array('label' => 'foo')); + + $this->assertMatchesXpath($html, '/div[@class="form-group"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2); + } } diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php index 990fffbe94689..64d7492047c3c 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php @@ -178,4 +178,13 @@ public function testStartTagWithExtraAttributes() $this->assertSame('', $html); } + + public function testCheckboxRow() + { + $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType'); + $view = $form->createView(); + $html = $this->renderRow($view, array('label' => 'foo')); + + $this->assertMatchesXpath($html, '/div[@class="form-group row"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2); + } } From b5cdb922e65a4755bfc638621468581297b10b50 Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 13:06:06 +0100 Subject: [PATCH 03/11] [TwigBridge] fix bootstrap 4 tests for #24703 --- .../Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php | 6 +++--- .../Component/Form/Tests/AbstractBootstrap4LayoutTest.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php index 64d7492047c3c..2833de7d91de0 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php @@ -26,8 +26,8 @@ public function testLabelOnForm() $html = $this->renderLabel($view); $this->assertMatchesXpath($html, -'/label - [@class="col-form-label col-sm-2 form-control-label required"] +'/legend + [@class="col-form-label col-sm-2 col-form-legend required"] [.="[trans]Name[/trans]"] ' ); @@ -118,7 +118,7 @@ public function testLegendOnExpandedType() $this->assertMatchesXpath($html, '/legend - [@class="col-sm-2 col-form-legend form-control-label required"] + [@class="col-sm-2 col-form-legend required"] [.="[trans]Custom label[/trans]"] ' ); diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php index 35bd1203b3f80..84f93cc332037 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php @@ -28,8 +28,8 @@ public function testLabelOnForm() $html = $this->renderLabel($view); $this->assertMatchesXpath($html, -'/label - [@class="form-control-label required"] +'/legend + [@class="col-form-legend required"] [.="[trans]Name[/trans]"] ' ); @@ -120,7 +120,7 @@ public function testLegendOnExpandedType() $this->assertMatchesXpath($html, '/legend - [@class="col-form-legend form-control-label required"] + [@class="col-form-legend required"] [.="[trans]Custom label[/trans]"] ' ); From b370fe9e999c9a990e316d06b2d9a967f6f85a7c Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 14:54:43 +0100 Subject: [PATCH 04/11] [TwigBridge] add whitespace control to form_label --- .../views/Form/bootstrap_3_horizontal_layout.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig index 8b3a7499e35b1..f96c8762061dd 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig @@ -16,12 +16,12 @@ col-sm-10 {# Labels #} {% block form_label -%} - {% if label is same as(false) %} + {%- if label is same as(false) -%}
- {% else %} + {%- else -%} {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ block('form_label_class'))|trim}) -%} {{- parent() -}} - {% endif %} + {%- endif -%} {%- endblock form_label %} {# Rows #} From 0e7e4b6d05c9829f19a0e202022b0b189f989738 Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 15:32:26 +0100 Subject: [PATCH 05/11] [TwigBridge] add whitespace control --- .../bootstrap_3_horizontal_layout.html.twig | 8 ++-- .../views/Form/bootstrap_3_layout.html.twig | 42 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig index f96c8762061dd..f93ec47c3051d 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig @@ -40,19 +40,19 @@ col-sm-10
{#--#}
{#--#}
- {{ form_widget(form) }} + {{- form_widget(form) -}}
{#--#}
-{% endblock submit_row %} +{%- endblock submit_row %} {% block reset_row -%}
{#--#}
{#--#}
- {{ form_widget(form) }} + {{- form_widget(form) -}}
{#--#}
-{% endblock reset_row %} +{%- endblock reset_row %} {% block checkbox_row -%}
{#--#} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig index 07ca81f5061ee..89efad7c62782 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig @@ -10,30 +10,30 @@ {%- endblock form_widget_simple %} {% block button_widget -%} - {% set attr = attr|merge({class: (attr.class|default('btn-default') ~ ' btn')|trim}) %} + {%- set attr = attr|merge({class: (attr.class|default('btn-default') ~ ' btn')|trim}) -%} {{- parent() -}} {%- endblock button_widget %} {% block checkbox_widget -%} {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%} - {% if 'checkbox-inline' in parent_label_class %} + {%- if 'checkbox-inline' in parent_label_class -%} {{- form_label(form, null, { widget: parent() }) -}} - {% else -%} + {%- else -%}
{{- form_label(form, null, { widget: parent() }) -}}
- {%- endif %} + {%- endif -%} {%- endblock checkbox_widget %} {% block radio_widget -%} {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%} - {% if 'radio-inline' in parent_label_class %} + {%- if 'radio-inline' in parent_label_class -%} {{- form_label(form, null, { widget: parent() }) -}} - {% else -%} + {%- else -%}
{{- form_label(form, null, { widget: parent() }) -}}
- {%- endif %} + {%- endif -%} {%- endblock radio_widget %} {# Labels #} @@ -61,30 +61,30 @@ {{- block('checkbox_radio_label') -}} {%- endblock radio_label %} -{% block checkbox_radio_label %} +{% block checkbox_radio_label -%} {# Do not display the label if widget is not defined in order to prevent double label rendering #} - {% if widget is defined %} - {% if required %} - {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %} - {% endif %} - {% if parent_label_class is defined %} - {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|trim}) %} - {% endif %} - {% if label is not same as(false) and label is empty %} + {%- if widget is defined -%} + {%- if required -%} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%} + {%- endif -%} + {%- if parent_label_class is defined -%} + {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|trim}) -%} + {%- endif -%} + {%- if label is not same as(false) and label is empty -%} {%- if label_format is not empty -%} - {% set label = label_format|replace({ + {%- set label = label_format|replace({ '%name%': name, '%id%': id, - }) %} + }) -%} {%- else -%} {% set label = name|humanize %} {%- endif -%} - {% endif %} + {%- endif -%} {{- widget|raw }} {{ label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans({}, translation_domain)) -}} - {% endif %} -{% endblock checkbox_radio_label %} + {%- endif -%} +{%- endblock checkbox_radio_label %} {# Rows #} From 6dbdce0c6db56ed8608bc4256b9bcab0408ec89e Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 19:25:55 +0100 Subject: [PATCH 06/11] [TwigBridge] bump dep on symfony/form --- src/Symfony/Bridge/Twig/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 33ac7d5849c7c..320440fab05ea 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -24,7 +24,7 @@ "symfony/asset": "~2.8|~3.0|~4.0", "symfony/dependency-injection": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/form": "~3.4|~4.0", + "symfony/form": "~3.4-beta2|~4.0", "symfony/http-foundation": "^3.3.11|~4.0", "symfony/http-kernel": "~3.2|~4.0", "symfony/polyfill-intl-icu": "~1.0", From 9a0e8cb1d99781e089116c55c420bec0c62c5d8d Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 19:39:04 +0100 Subject: [PATCH 07/11] [TwigBridge] revert form_label_class & form_group_class change --- .../bootstrap_3_horizontal_layout.html.twig | 18 +++++++++--------- .../bootstrap_4_horizontal_layout.html.twig | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig index f93ec47c3051d..d1279951c192e 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig @@ -1,13 +1,5 @@ {% use "bootstrap_3_layout.html.twig" %} -{% block form_label_class -%} -col-sm-2 -{%- endblock form_label_class %} - -{% block form_group_class -%} -col-sm-10 -{%- endblock form_group_class %} - {% block form_start -%} {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-horizontal')|trim}) %} {{- parent() -}} @@ -24,6 +16,10 @@ col-sm-10 {%- endif -%} {%- endblock form_label %} +{% block form_label_class -%} + col-sm-2 +{%- endblock form_label_class %} + {# Rows #} {% block form_row -%} @@ -54,6 +50,10 @@ col-sm-10
{%- endblock reset_row %} +{% block form_group_class -%} + col-sm-10 +{%- endblock form_group_class %} + {% block checkbox_row -%}
{#--#}
{#--#} @@ -62,4 +62,4 @@ col-sm-10 {{- form_errors(form) -}}
{#--#} -{%- endblock checkbox_row %} +{%- endblock checkbox_row %} \ No newline at end of file diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig index 8f62917d03080..f885489bf7418 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig @@ -1,13 +1,5 @@ {% use "bootstrap_4_layout.html.twig" %} -{% block form_label_class -%} -col-sm-2 -{%- endblock form_label_class %} - -{% block form_group_class -%} -col-sm-10 -{%- endblock form_group_class %} - {# Labels #} {% block form_label -%} @@ -22,6 +14,10 @@ col-sm-10 {%- endif -%} {%- endblock form_label %} +{% block form_label_class -%} + col-sm-2 +{%- endblock form_label_class %} + {# Rows #} {% block form_row -%} @@ -68,6 +64,10 @@ col-sm-10 {%- endblock reset_row %} +{% block form_group_class -%} + col-sm-10 +{%- endblock form_group_class %} + {% block checkbox_row -%}
{#--#}
{#--#} From fe4eda6f1900b541bc7c43c823dcc50afcef7368 Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 19:40:37 +0100 Subject: [PATCH 08/11] [TwigBridge] revert form_label_class & form_group_class change --- .../views/Form/bootstrap_3_horizontal_layout.html.twig | 4 ++-- .../views/Form/bootstrap_4_horizontal_layout.html.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig index d1279951c192e..f0c4626daf45e 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig @@ -17,7 +17,7 @@ {%- endblock form_label %} {% block form_label_class -%} - col-sm-2 +col-sm-2 {%- endblock form_label_class %} {# Rows #} @@ -51,7 +51,7 @@ {%- endblock reset_row %} {% block form_group_class -%} - col-sm-10 +col-sm-10 {%- endblock form_group_class %} {% block checkbox_row -%} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig index f885489bf7418..0f0a0953282d8 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig @@ -15,7 +15,7 @@ {%- endblock form_label %} {% block form_label_class -%} - col-sm-2 +col-sm-2 {%- endblock form_label_class %} {# Rows #} @@ -65,7 +65,7 @@ {%- endblock reset_row %} {% block form_group_class -%} - col-sm-10 +col-sm-10 {%- endblock form_group_class %} {% block checkbox_row -%} From f0e97ba1b1148909337e62254f5d81ee2ce6f855 Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 19:48:02 +0100 Subject: [PATCH 09/11] [TwigBridge] remove unnecessary whitespace control --- .../Twig/Resources/views/Form/bootstrap_3_layout.html.twig | 4 ++-- .../Twig/Resources/views/Form/bootstrap_4_layout.html.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig index 89efad7c62782..64fc2a210ee3e 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig @@ -16,9 +16,9 @@ {% block checkbox_widget -%} {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%} - {%- if 'checkbox-inline' in parent_label_class -%} + {% if 'checkbox-inline' in parent_label_class %} {{- form_label(form, null, { widget: parent() }) -}} - {%- else -%} + {% else -%}
{{- form_label(form, null, { widget: parent() }) -}}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig index f9cb62209daf3..ddacf58c2022e 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig @@ -24,9 +24,9 @@ {% block checkbox_widget -%} {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%} {%- set attr = attr|merge({class: attr.class|default('form-check-input')}) -%} - {%- if 'checkbox-inline' in parent_label_class -%} + {% if 'checkbox-inline' in parent_label_class -%} {{- form_label(form, null, { widget: parent() }) -}} - {%- else -%} + {% else -%}
{{- form_label(form, null, { widget: parent() }) -}}
From 6f07a0ff175fbb8759b1a0cd07a8257347f87754 Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 19:48:44 +0100 Subject: [PATCH 10/11] [TwigBridge] remove unnecessary whitespace control --- .../Twig/Resources/views/Form/bootstrap_4_layout.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig index ddacf58c2022e..2407b16d9b99a 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig @@ -24,7 +24,7 @@ {% block checkbox_widget -%} {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%} {%- set attr = attr|merge({class: attr.class|default('form-check-input')}) -%} - {% if 'checkbox-inline' in parent_label_class -%} + {% if 'checkbox-inline' in parent_label_class %} {{- form_label(form, null, { widget: parent() }) -}} {% else -%}
From cbecd021aac47b9ed6cdbf7c7a8cb7d391f79919 Mon Sep 17 00:00:00 2001 From: Arkadius Stefanski Date: Mon, 30 Oct 2017 19:56:10 +0100 Subject: [PATCH 11/11] [TwigBridge] EOL added --- .../views/Form/bootstrap_3_horizontal_layout.html.twig | 2 +- .../views/Form/bootstrap_4_horizontal_layout.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig index f0c4626daf45e..d6b08f76375c4 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig @@ -62,4 +62,4 @@ col-sm-10 {{- form_errors(form) -}}
{#--#}
-{%- endblock checkbox_row %} \ No newline at end of file +{%- endblock checkbox_row %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig index 0f0a0953282d8..e236d12cb709a 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig @@ -76,4 +76,4 @@ col-sm-10 {{- form_errors(form) -}} {#--#} -{%- endblock checkbox_row %} \ No newline at end of file +{%- endblock checkbox_row %}