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

[TwigBundle] Resolve some TODOs in form templates

Browse Source
This commit is contained in:
Jordi Boggiano 2011-02-17 15:24:10 +01:00 committed by Fabien Potencier
parent c5e4dfb5a6
commit 38813c122e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Symfony/Bundle/TwigBundle/Resources/views/form.html.twig
View File

@ -65,7 +65,7 @@
{% if attr.type is defined and attr.type != "text" %} {% if attr.type is defined and attr.type != "text" %}
<input {{ block('field_attributes') }} value="{{ field.displayedData }}" /> <input {{ block('field_attributes') }} value="{{ field.displayedData }}" />
{% else %} {% else %}
{#{% set attr.maxlength = attr.maxlength|default(field.maxlength) %}#} {% set attr = attr|merge({ 'maxlength': attr.maxlength|default(field.maxlength) }) %}
<input type="text" {{ block('field_attributes') }} value="{{ field.displayedData }}" /> <input type="text" {{ block('field_attributes') }} value="{{ field.displayedData }}" />
{% endif %} {% endif %}
{% endspaceless %} {% endspaceless %}
@ -73,7 +73,7 @@
{% block password_field %} {% block password_field %}
{% spaceless %} {% spaceless %}
{#{% set attr.maxlength = attr.maxlength|default(field.maxlength) %}#} {% set attr = attr|merge({ 'maxlength': attr.maxlength|default(field.maxlength) }) %}
<input type="password" {{ block('field_attributes') }} value="{{ field.displayedData }}" /> <input type="password" {{ block('field_attributes') }} value="{{ field.displayedData }}" />
{% endspaceless %} {% endspaceless %}
{% endblock password_field %} {% endblock password_field %}
@ -160,16 +160,14 @@
{% block time_field %} {% block time_field %}
{% spaceless %} {% spaceless %}
{# TODO the next line should be set attr.size = 1, but that's not supported yet by Twig #} {% if field.isField %}{% set attr = attr|merge({ 'size': 1 }) %}{% endif %}
{% if field.isField %}{% set attr = { 'size': 1 } %}{% endif %}
{{ form_field(field.hour, attr) }}:{{ form_field(field.minute, attr) }}{% if field.isWithSeconds %}:{{ form_field(field.second, attr) }}{% endif %} {{ form_field(field.hour, attr) }}:{{ form_field(field.minute, attr) }}{% if field.isWithSeconds %}:{{ form_field(field.second, attr) }}{% endif %}
{% endspaceless %} {% endspaceless %}
{% endblock time_field %} {% endblock time_field %}
{% block number_field %} {% block number_field %}
{% spaceless %} {% spaceless %}
{# TODO the next line should be set attr.type = 'number', but that's not supported yet by Twig #} {% set attr = attr|merge({ 'type': 'number' }) %}
{% set attr = { 'type': 'number' } %}
{{ block('text_field') }} {{ block('text_field') }}
{% endspaceless %} {% endspaceless %}
{% endblock number_field %} {% endblock number_field %}
@ -182,8 +180,7 @@
{% block url_field %} {% block url_field %}
{% spaceless %} {% spaceless %}
{# TODO the next line should be set attr.type = 'url', but that's not supported yet by Twig #} {% set attr = attr|merge({ 'type': 'url' }) %}
{% set attr = { 'type': 'url' } %}
{{ block('text_field') }} {{ block('text_field') }}
{% endspaceless %} {% endspaceless %}
{% endblock url_field %} {% endblock url_field %}