diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #19676 [Bridge] [Twig] replaces tabs by spaces in Twig form themes templates. (hhamon)

Browse Source 
This PR was merged into the 3.2-dev branch.

Discussion
----------

[Bridge] [Twig] replaces tabs by spaces in Twig form themes templates.

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Commits
-------

d88f2a4 [Bridge] [Twig] replaces tabs by spaces in Twig form themes templates.
This commit is contained in:
Fabien Potencier 2016-08-20 08:15:38 -07:00
commit 94078a09ac
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
View File

@ -87,24 +87,24 @@
{% endif %} {% endif %}
{%- endblock time_widget %} {%- endblock time_widget %}
{% block dateinterval_widget %} {%- block dateinterval_widget -%}
{% if widget == 'single_text' %} {%- if widget == 'single_text' -%}
{{- block('form_widget_simple') -}} {{- block('form_widget_simple') -}}
{% else %} {%- else -%}
{% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) %} {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
<div {{ block('widget_container_attributes') }}> <div {{ block('widget_container_attributes') }}>
{{ form_errors(form) }} {{- form_errors(form) -}}
{% if with_years %}{{ form_widget(form.years) }}{% endif %} {%- if with_years %}{{ form_widget(form.years) }}{% endif -%}
{% if with_months %}{{ form_widget(form.months) }}{% endif %} {%- if with_months %}{{ form_widget(form.months) }}{% endif -%}
{% if with_weeks %}{{ form_widget(form.weeks) }}{% endif %} {%- if with_weeks %}{{ form_widget(form.weeks) }}{% endif -%}
{% if with_days %}{{ form_widget(form.days) }}{% endif %} {%- if with_days %}{{ form_widget(form.days) }}{% endif -%}
{% if with_hours %}{{ form_widget(form.hours) }}{% endif %} {%- if with_hours %}{{ form_widget(form.hours) }}{% endif -%}
{% if with_minutes %}{{ form_widget(form.minutes) }}{% endif %} {%- if with_minutes %}{{ form_widget(form.minutes) }}{% endif -%}
{% if with_seconds %}{{ form_widget(form.seconds) }}{% endif %} {%- if with_seconds %}{{ form_widget(form.seconds) }}{% endif -%}
{% if with_invert %}{{ form_widget(form.invert) }}{% endif %} {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%}
</div> </div>
{% endif %} {%- endif -%}
{% endblock dateinterval_widget %} {%- endblock dateinterval_widget -%}
{% block choice_widget_collapsed -%} {% block choice_widget_collapsed -%}
{% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %} {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %}

34
src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
View File

@ -130,23 +130,23 @@
{%- endif -%} {%- endif -%}
{%- endblock time_widget -%} {%- endblock time_widget -%}
{% block dateinterval_widget %} {%- block dateinterval_widget -%}
{% if widget == 'single_text' %} {%- if widget == 'single_text' -%}
{{- block('form_widget_simple') -}} {{- block('form_widget_simple') -}}
{% else %} {%- else -%}
<div {{ block('widget_container_attributes') }}> <div {{ block('widget_container_attributes') }}>
{{ form_errors(form) }} {{- form_errors(form) -}}
{% if with_years %}{{ form_widget(form.years) }}{% endif %} {%- if with_years %}{{ form_widget(form.years) }}{% endif -%}
{% if with_months %}{{ form_widget(form.months) }}{% endif %} {%- if with_months %}{{ form_widget(form.months) }}{% endif -%}
{% if with_weeks %}{{ form_widget(form.weeks) }}{% endif %} {%- if with_weeks %}{{ form_widget(form.weeks) }}{% endif -%}
{% if with_days %}{{ form_widget(form.days) }}{% endif %} {%- if with_days %}{{ form_widget(form.days) }}{% endif -%}
{% if with_hours %}{{ form_widget(form.hours) }}{% endif %} {%- if with_hours %}{{ form_widget(form.hours) }}{% endif -%}
{% if with_minutes %}{{ form_widget(form.minutes) }}{% endif %} {%- if with_minutes %}{{ form_widget(form.minutes) }}{% endif -%}
{% if with_seconds %}{{ form_widget(form.seconds) }}{% endif %} {%- if with_seconds %}{{ form_widget(form.seconds) }}{% endif -%}
{% if with_invert %}{{ form_widget(form.invert) }}{% endif %} {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%}
</div> </div>
{% endif %} {%- endif -%}
{% endblock dateinterval_widget %} {%- endblock dateinterval_widget -%}
{%- block number_widget -%} {%- block number_widget -%}
{# type="number" doesn't work with floats #} {# type="number" doesn't work with floats #}