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

[Form] Changed separator for Twig blocks from double underscore to single underscore to match the PHP template separator

Browse Source
This commit is contained in:
Bernhard Schussek 2011-04-18 14:28:01 +02:00
parent f078554c2a
commit 273d72ef75
3 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Twig/Extension/FormExtension.php
View File

@ -162,7 +162,7 @@ class FormExtension extends \Twig_Extension
$templates = $this->getTemplates($view, $resources);
$blocks = $view->get('types');
foreach ($blocks as &$block) {
$block = $block.'__'.$section;
$block = $block.'_'.$section;
if (isset($templates[$block])) {
if ('widget' === $section || 'row' === $section) {

144
src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
View File

@ -1,19 +1,19 @@
{% block field__rows %}
{% block field_rows %}
{% spaceless %}
{{ form_errors(form) }}
{% for child in form.children %}
{{ form_row(child) }}
{% endfor %}
{% endspaceless %}
{% endblock field__rows %}
{% endblock field_rows %}
{% block field__enctype %}
{% block field_enctype %}
{% spaceless %}
{% if multipart %}enctype="multipart/form-data"{% endif %}
{% endspaceless %}
{% endblock field__enctype %}
{% endblock field_enctype %}
{% block field__errors %}
{% block field_errors %}
{% spaceless %}
{% if errors|length > 0 %}
<ul>
@ -23,9 +23,9 @@
</ul>
{% endif %}
{% endspaceless %}
{% endblock field__errors %}
{% endblock field_errors %}
{% block field__rest %}
{% block field_rest %}
{% spaceless %}
{% for child in form.children %}
{% if not child.rendered %}
@ -33,13 +33,13 @@
{% endif %}
{% endfor %}
{% endspaceless %}
{% endblock field__rest %}
{% endblock field_rest %}
{% block field__label %}
{% block field_label %}
{% spaceless %}
<label for="{{ id }}">{% trans label %}</label>
{% endspaceless %}
{% endblock field__label %}
{% endblock field_label %}
{% block attributes %}
{% spaceless %}
@ -48,48 +48,48 @@
{% endspaceless %}
{% endblock attributes %}
{% block field__widget %}
{% block field_widget %}
{% spaceless %}
{% set type = type|default('text') %}
<input type="{{ type }}" {{ block('attributes') }} value="{{ value }}" />
{% endspaceless %}
{% endblock field__widget %}
{% endblock field_widget %}
{% block text__widget %}
{% block text_widget %}
{% spaceless %}
{% set type = type|default('text') %}
{{ block('field__widget') }}
{{ block('field_widget') }}
{% endspaceless %}
{% endblock text__widget %}
{% endblock text_widget %}
{% block password__widget %}
{% block password_widget %}
{% spaceless %}
{% set type = type|default('password') %}
{{ block('field__widget') }}
{{ block('field_widget') }}
{% endspaceless %}
{% endblock password__widget %}
{% endblock password_widget %}
{% block hidden__widget %}
{% block hidden_widget %}
{% set type = type|default('hidden') %}
{{ block('field__widget') }}
{% endblock hidden__widget %}
{{ block('field_widget') }}
{% endblock hidden_widget %}
{% block csrf__widget %}
{% block csrf_widget %}
{% if not form.hasParent or not form.getParent.hasParent %}
{% set type = type|default('hidden') %}
{{ block('field__widget') }}
{{ block('field_widget') }}
{% endif %}
{% endblock csrf__widget %}
{% endblock csrf_widget %}
{% block hidden__row %}
{% block hidden_row %}
{{ form_widget(form) }}
{% endblock hidden__row %}
{% endblock hidden_row %}
{% block textarea__widget %}
{% block textarea_widget %}
{% spaceless %}
<textarea {{ block('attributes') }}>{{ value }}</textarea>
{% endspaceless %}
{% endblock textarea__widget %}
{% endblock textarea_widget %}
{% block options %}
{% spaceless %}
@ -107,7 +107,7 @@
{% endspaceless %}
{% endblock options %}
{% block choice__widget %}
{% block choice_widget %}
{% spaceless %}
{% if expanded %}
<div {{ block('attributes') }}>
@ -131,21 +131,21 @@
</select>
{% endif %}
{% endspaceless %}
{% endblock choice__widget %}
{% endblock choice_widget %}
{% block checkbox__widget %}
{% block checkbox_widget %}
{% spaceless %}
<input type="checkbox" {{ block('attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
{% endspaceless %}
{% endblock checkbox__widget %}
{% endblock checkbox_widget %}
{% block radio__widget %}
{% block radio_widget %}
{% spaceless %}
<input type="radio" {{ block('attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
{% endspaceless %}
{% endblock radio__widget %}
{% endblock radio_widget %}
{% block datetime__widget %}
{% block datetime_widget %}
{% spaceless %}
<div {{ block('attributes') }}>
{{ form_errors(form.date) }}
@ -154,12 +154,12 @@
{{ form_widget(form.time) }}
</div>
{% endspaceless %}
{% endblock datetime__widget %}
{% endblock datetime_widget %}
{% block date__widget %}
{% block date_widget %}
{% spaceless %}
{% if widget == 'text' %}
{{ block('text__widget') }}
{{ block('text_widget') }}
{% else %}
<div {{ block('attributes') }}>
{{ date_pattern|replace({
@ -170,52 +170,52 @@
</div>
{% endif %}
{% endspaceless %}
{% endblock date__widget %}
{% endblock date_widget %}
{% block time__widget %}
{% block time_widget %}
{% spaceless %}
<div {{ block('attributes') }}>
{{ form_widget(form.hour, { 'attr': { 'size': '1' } }) }}:{{ form_widget(form.minute, { 'attr': { 'size': '1' } }) }}{% if with_seconds %}:{{ form_widget(form.second, { 'attr': { 'size': '1' } }) }}{% endif %}
</div>
{% endspaceless %}
{% endblock time__widget %}
{% endblock time_widget %}
{% block number__widget %}
{% block number_widget %}
{% spaceless %}
{# type="number" doesn't work with floats #}
{% set type = type|default('text') %}
{{ block('field__widget') }}
{{ block('field_widget') }}
{% endspaceless %}
{% endblock number__widget %}
{% endblock number_widget %}
{% block integer__widget %}
{% block integer_widget %}
{% spaceless %}
{% set type = type|default('number') %}
{{ block('field__widget') }}
{{ block('field_widget') }}
{% endspaceless %}
{% endblock integer__widget %}
{% endblock integer_widget %}
{% block money__widget %}
{% block money_widget %}
{% spaceless %}
foo {{ money_pattern|replace({ '{{ widget }}': block('field__widget') })|raw }}
foo {{ money_pattern|replace({ '{{ widget }}': block('field_widget') })|raw }}
{% endspaceless %}
{% endblock money__widget %}
{% endblock money_widget %}
{% block url__widget %}
{% block url_widget %}
{% spaceless %}
{% set type = type|default('url') %}
{{ block('field__widget') }}
{{ block('field_widget') }}
{% endspaceless %}
{% endblock url__widget %}
{% endblock url_widget %}
{% block percent__widget %}
{% block percent_widget %}
{% spaceless %}
{% set type = type|default('text') %}
{{ block('field__widget') }} %
{{ block('field_widget') }} %
{% endspaceless %}
{% endblock percent__widget %}
{% endblock percent_widget %}
{% block file__widget %}
{% block file_widget %}
{% spaceless %}
<div {{ block('attributes') }}>
{{ form_widget(form.file) }}
@ -223,22 +223,22 @@
{{ form_widget(form.name) }}
</div>
{% endspaceless %}
{% endblock file__widget %}
{% endblock file_widget %}
{% block collection__widget %}
{% block collection_widget %}
{% spaceless %}
{{ block('form__widget') }}
{{ block('form_widget') }}
{% endspaceless %}
{% endblock collection__widget %}
{% endblock collection_widget %}
{% block repeated__row %}
{% block repeated_row %}
{% spaceless %}
{{ block('field__rows') }}
{{ block('field_rows') }}
{% endspaceless %}
{% endblock repeated__row %}
{% endblock repeated_row %}
{% block field__row %}
{% block field_row %}
{% spaceless %}
<div>
{{ form_label(form) }}
@ -246,20 +246,20 @@
{{ form_widget(form) }}
</div>
{% endspaceless %}
{% endblock field__row %}
{% endblock field_row %}
{% block form__widget %}
{% block form_widget %}
{% spaceless %}
<div {{ block('attributes') }}>
{{ block('field__rows') }}
{{ block('field_rows') }}
{{ form_rest(form) }}
</div>
{% endspaceless %}
{% endblock form__widget %}
{% endblock form_widget %}
{% block email__widget %}
{% block email_widget %}
{% spaceless %}
{% set type = type|default('email') %}
{{ block('field__widget') }}
{{ block('field_widget') }}
{% endspaceless %}
{% endblock email__widget %}
{% endblock email_widget %}

26
src/Symfony/Bundle/TwigBundle/Resources/views/Form/table_layout.html.twig
View File

@ -1,6 +1,6 @@
{% extends "TwigBundle:Form:div_layout.html.twig" %}
{% block field__row %}
{% block field_row %}
{% spaceless %}
<tr>
<td>
@ -12,21 +12,21 @@
</td>
</tr>
{% endspaceless %}
{% endblock field__row %}
{% endblock field_row %}
{% block form__errors %}
{% block form_errors %}
{% spaceless %}
{% if errors|length > 0 %}
<tr>
<td colspan="2">
{{ block('field__errors') }}
{{ block('field_errors') }}
</td>
</tr>
{% endif %}
{% endspaceless %}
{% endblock form__errors %}
{% endblock form_errors %}
{% block hidden__row %}
{% block hidden_row %}
{% spaceless %}
<tr style="display: none">
<td colspan="2">
@ -34,19 +34,19 @@
</td>
</tr>
{% endspaceless %}
{% endblock hidden__row %}
{% endblock hidden_row %}
{% block repeated__errors %}
{% block repeated_errors %}
{% spaceless %}
{{ block('form__errors') }}
{{ block('form_errors') }}
{% endspaceless %}
{% endblock repeated__errors %}
{% endblock repeated_errors %}
{% block form__widget %}
{% block form_widget %}
{% spaceless %}
<table {{ block('attributes') }}>
{{ block('field__rows') }}
{{ block('field_rows') }}
{{ form_rest(form) }}
</table>
{% endspaceless %}
{% endblock form__widget %}
{% endblock form_widget %}