From d88f2a483f0961d9ef40779e1314417b73a56e2e Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Fri, 19 Aug 2016 18:28:14 +0200 Subject: [PATCH] [Bridge] [Twig] replaces tabs by spaces in Twig form themes templates. --- .../views/Form/bootstrap_3_layout.html.twig | 36 +++++++++---------- .../views/Form/form_div_layout.html.twig | 34 +++++++++--------- 2 files changed, 35 insertions(+), 35 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 0f23d8c58e..5fb3a18f1d 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 @@ -87,24 +87,24 @@ {% endif %} {%- endblock time_widget %} -{% block dateinterval_widget %} - {% if widget == 'single_text' %} - {{- block('form_widget_simple') -}} - {% else %} - {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) %} -
- {{ form_errors(form) }} - {% if with_years %}{{ form_widget(form.years) }}{% endif %} - {% if with_months %}{{ form_widget(form.months) }}{% endif %} - {% if with_weeks %}{{ form_widget(form.weeks) }}{% endif %} - {% if with_days %}{{ form_widget(form.days) }}{% endif %} - {% if with_hours %}{{ form_widget(form.hours) }}{% endif %} - {% if with_minutes %}{{ form_widget(form.minutes) }}{% endif %} - {% if with_seconds %}{{ form_widget(form.seconds) }}{% endif %} - {% if with_invert %}{{ form_widget(form.invert) }}{% endif %} -
- {% endif %} -{% endblock dateinterval_widget %} +{%- block dateinterval_widget -%} + {%- if widget == 'single_text' -%} + {{- block('form_widget_simple') -}} + {%- else -%} + {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%} +
+ {{- form_errors(form) -}} + {%- if with_years %}{{ form_widget(form.years) }}{% endif -%} + {%- if with_months %}{{ form_widget(form.months) }}{% endif -%} + {%- if with_weeks %}{{ form_widget(form.weeks) }}{% endif -%} + {%- if with_days %}{{ form_widget(form.days) }}{% endif -%} + {%- if with_hours %}{{ form_widget(form.hours) }}{% endif -%} + {%- if with_minutes %}{{ form_widget(form.minutes) }}{% endif -%} + {%- if with_seconds %}{{ form_widget(form.seconds) }}{% endif -%} + {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%} +
+ {%- endif -%} +{%- endblock dateinterval_widget -%} {% block choice_widget_collapsed -%} {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig index 6178be6813..e1d09153df 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig @@ -130,23 +130,23 @@ {%- endif -%} {%- endblock time_widget -%} -{% block dateinterval_widget %} - {% if widget == 'single_text' %} - {{- block('form_widget_simple') -}} - {% else %} -
- {{ form_errors(form) }} - {% if with_years %}{{ form_widget(form.years) }}{% endif %} - {% if with_months %}{{ form_widget(form.months) }}{% endif %} - {% if with_weeks %}{{ form_widget(form.weeks) }}{% endif %} - {% if with_days %}{{ form_widget(form.days) }}{% endif %} - {% if with_hours %}{{ form_widget(form.hours) }}{% endif %} - {% if with_minutes %}{{ form_widget(form.minutes) }}{% endif %} - {% if with_seconds %}{{ form_widget(form.seconds) }}{% endif %} - {% if with_invert %}{{ form_widget(form.invert) }}{% endif %} -
- {% endif %} -{% endblock dateinterval_widget %} +{%- block dateinterval_widget -%} + {%- if widget == 'single_text' -%} + {{- block('form_widget_simple') -}} + {%- else -%} +
+ {{- form_errors(form) -}} + {%- if with_years %}{{ form_widget(form.years) }}{% endif -%} + {%- if with_months %}{{ form_widget(form.months) }}{% endif -%} + {%- if with_weeks %}{{ form_widget(form.weeks) }}{% endif -%} + {%- if with_days %}{{ form_widget(form.days) }}{% endif -%} + {%- if with_hours %}{{ form_widget(form.hours) }}{% endif -%} + {%- if with_minutes %}{{ form_widget(form.minutes) }}{% endif -%} + {%- if with_seconds %}{{ form_widget(form.seconds) }}{% endif -%} + {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%} +
+ {%- endif -%} +{%- endblock dateinterval_widget -%} {%- block number_widget -%} {# type="number" doesn't work with floats #}