8000 [Form][FrameworkBundle] Make FormHelper::renderSection() recursively … · symfony/symfony@e09ae3f · GitHub
[go: up one dir, main page]
Skip to content

Commit e09ae3f

Browse files
vicbvicb
committed
[Form][FrameworkBundle] Make FormHelper::renderSection() recursively callable, introduce FormHelper::renderBlock()
1 parent e43fb98 commit e09ae3f

29 files changed

+96
-177
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
id="<?php echo $view->escape($id) ?>"
2+
name="<?php echo $view->escape($full_name) ?>"
3+
<?php if ($read_only): ?>disabled="disabled" <?php endif ?>
4+
<?php if ($required): ?>required="required" <?php endif ?>
5+
<?php if ($max_length): ?>maxlength="<?php echo $view->escape($max_length) ?>" <?php endif ?>
6+
<?php if ($pattern): ?>pattern="<?php echo $view->escape($pattern) ?>" <?php endif ?>
7+
<?php foreach($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>
8+

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<input type="checkbox"
2-
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($full_name) ?>"
4-
<?php if ($value): ?>value="<?php echo $view->escape($value) ?>"<?php endif ?>
5-
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
6-
<?php if ($required): ?>required="required"<?php endif ?>
7-
<?php if ($checked): ?>checked="checked"<?php endif ?>
2+
<?php echo $view['form']->renderBlock('attributes') ?>
3+
<?php if ($value): ?> value="<?php echo $view->escape($value) ?>"<?php endif ?>
4+
<?php if ($checked): ?> checked="checked"<?php endif ?>
85
/>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<?php if ($expanded): ?>
2-
<div<?php echo $view['form']->attributes() ?>>
3-
<?php foreach ($form as $choice => $child): ?>
2+
<div <?php echo $view['form']->renderBlock('container_attributes') ?>>
3+
<?php foreach ($form as $child): ?>
44
<?php echo $view['form']->widget($child) ?>
55
<?php echo $view['form']->label($child) ?>
66
<?php endforeach ?>
77
</div>
88
<?php else: ?>
99
<select
10-
<?php echo $view['form']->attributes() ?>
11-
name="<?php echo $view->escape($full_name) ?>"
12-
<?php if ($read_only): ?> disabled="disabled"<?php endif ?>
10+
<?php echo $view['form']->renderBlock('attributes') ?>
1311
<?php if ($multiple): ?> multiple="multiple"<?php endif ?>
1412
>
1513
<?php if (null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value)) ?></option><?php endif; ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/container_attributes.html.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
id="<?php echo $view->escape($id) ?>"
2+
<?php foreach($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
<?php if ($widget == 'single_text'): ?>
2-
<input type="text"
3-
<?php echo $view['form']->attributes() ?>
4-
name="<?php echo $view->escape($full_name) ?>"
5-
value="<?php echo $view->escape($value) ?>"
6-
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
7-
<?php if ($required): ?>required="required"<?php endif ?>
8-
<?php if ($max_length): ?>maxlength="<?php echo $max_length ?>"<?php endif ?>
9-
/>
2+
<?php echo $view['form']->widget($form); ?>
103
<?php else: ?>
11-
<div<?php echo $view['form']->attributes() ?>>
4+
<div <?php echo $view['form']->renderBlock('container_attributes') ?>>
125
<?php echo str_replace(array('{{ year }}', '{{ month }}', '{{ day }}'), array(
136
$view['form']->widget($form['year']),
147
$view['form']->widget($form['month']),

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div<?php echo $view['form']->attributes() ?>>
1+
<div <?php echo $view['form']->renderBlock('container_attributes') ?>>
22
<?php echo $view['form']->widget($form['date'])
33
. ' '
44
. $view['form']->widget($form['time']) ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
<input type="email"
2-
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($full_name) ?>"
4-
value="<?php echo $view->escape($value) ?>"
5-
<?php if ($max_length): ?>maxlength="<?php echo $view->escape($max_length) ?>"<?php endif ?>
6-
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
7-
<?php if ($required): ?>required="required"<?php endif ?>
8-
/>
1+
<?php echo $view['form']->widget($form, array('type' => isset($type) ? $type : 'email')) ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<label for="<?php echo $view->escape($id) ?>" <?php echo $view['form']->attributes(false) ?>><?php echo $view->escape($view['translator']->trans($label)) ?></label>
1+
<label for="<?php echo $view->escape($id) ?>" <?php foreach($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape($view['translator']->trans($label)) ?></label>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rows.html.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?php echo $view['form']->errors($form) ?>
2+
<?php foreach ($form as $child) : ?>
3+
<?php echo $view['form']->row($child) ?>
4+
<?php endforeach; ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<input
2-
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($full_name) ?>"
2+
type="<?php echo isset($type) ? $view->escape($type) : "text" ?>"
43
value="<?php echo $view->escape($value) ?>"
5-
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
6-
<?php if ($required): ?>required="required"<?php endif ?>
4+
<?php echo $view['form']->renderBlock('attributes') ?>
75
/>

0 commit comments

Comments
 (0)
0