adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding label and fieldset for radio, set label=>false to turn it off, css adjusted

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5585 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-08-27 00:11:36 +00:00
parent 9072c07cd6
commit e54fe6a523
4 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/webroot/css/cake.generic.css
View file

@ -196,6 +196,10 @@ fieldset legend {
font-size: 160%;
font-weight: bold;
}
fieldset fieldset legend {
font-size: 120%;
font-weight: normal;
}
form div {
clear: both;
margin-bottom: 1em;

4
cake/console/libs/templates/skel/webroot/css/cake.generic.css
View file

@ -196,6 +196,10 @@ fieldset legend {
font-size: 160%;
font-weight: bold;
}
fieldset fieldset legend {
font-size: 120%;
font-weight: normal;
}
form div {
clear: both;
margin-bottom: 1em;

27
cake/libs/view/helpers/form.php
View file

@ -576,7 +576,7 @@ class FormHelper extends AppHelper {
$labelText = $label['text'];
unset($label['text']);
}
$labelAttributes = am($labelAttributes, $label);
} else {
$labelText = $label;
@ -585,7 +585,11 @@ class FormHelper extends AppHelper {
if (!empty($labelText)) {
$labelText = __($labelText, true);
}
$out = $this->label(null, $labelText, $labelAttributes);
if($options['type'] != 'radio') {
$out = $this->label(null, $labelText, $labelAttributes);
} else {
$options['label'] = $labelText;
}
}
$error = null;
@ -736,6 +740,11 @@ class FormHelper extends AppHelper {
if (isset($attributes['id'])) {
unset($attributes['id']);
}
$label = $this->field();
if (isset($attributes['label'])) {
$label = $attributes['label'];
unset($attributes['label']);
}
$value = isset($attributes['value']) ? $attributes['value'] : $this->value($fieldName);
$out = array();
@ -747,16 +756,19 @@ class FormHelper extends AppHelper {
if (!empty($value) && $optValue == $value) {
$optionsHere['checked'] = 'checked';
}
$parsedOptions = $this->_parseAttributes(array_merge($attributes, $optionsHere), null, '', ' ');
$individualTagName = $this->field() . "_{$optValue}";
$out[] = sprintf($this->Html->tags['radio'], $this->model(), $this->field(), $individualTagName, $parsedOptions, $optTitle);
$fieldName = $this->field() . '_'.Inflector::underscore($optValue);
$tagName = Inflector::camelize($fieldName);
if($label) {
$optTitle = sprintf($this->Html->tags['label'], $tagName, null, $optValue);
}
$out[] = sprintf($this->Html->tags['radio'], $this->model(), $this->field(), $tagName, $parsedOptions, $optTitle);
$count++;
}
$out = join($inbetween, $out);
return $this->output($out ? $out : null);
$out = sprintf($this->Html->tags['fieldset'], $label, join($inbetween, $out));
return $this->output($out);
}
/**
* Creates a text input widget.
@ -1278,7 +1290,6 @@ class FormHelper extends AppHelper {
$attributes = am(array('escape' => true), $attributes);
$selectedIsEmpty = ($selected === '' || $selected === null);
$selectedIsArray = is_array($selected);
foreach ($elements as $name => $title) {
$htmlOptions = array();
if (is_array($title) && (!isset($title['name']) || !isset($title['value']))) {

4
cake/tests/cases/libs/view/helpers/form.test.php
View file

@ -450,8 +450,8 @@ class FormHelperTest extends CakeTestCase {
function testRadio() {
$result = $this->Form->radio('Model.field', array('option A', 'option B'));
$this->assertPattern('/id="field_0"/', $result);
$this->assertPattern('/id="field_1"/', $result);
$this->assertPattern('/id="Field0"/', $result);
$this->assertPattern('/id="Field1"/', $result);
$this->assertNoPattern('/id="ModelField"/', $result);
$this->assertNoPattern('/checked="checked"/', $result);
}