tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT Custom tags for CompositeField, which allows for nesting <fieldset> elements (not possible through the toplevel-only FieldList/FieldSet class)

Browse Source
This commit is contained in:
Ingo Schommer 2012-02-16 15:44:36 +01:00
parent 7602d081a2
commit b417daf7af
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
forms/CompositeField.php
View File

@ -27,6 +27,11 @@ class CompositeField extends FormField {
* count of your $children.
*/
protected $columnCount = null;
/**
* @var String custom HTML tag to render with, e.g. to produce a <fieldset>.
*/
protected $tag = 'div';
public function __construct($children = null) {
if($children instanceof FieldList) {
@ -85,6 +90,17 @@ class CompositeField extends FormField {
return $this;
}
/** @param String */
public function setTag($tag) {
$this->tag = $tag;
return $this;
}
/** @return String */
public function getTag() {
return $this->tag;
}
function extraClasses() {
$classes = array('field', 'CompositeField', parent::extraClasses());
if($this->columnCount) $classes[] = 'multicolumn';
@ -114,7 +130,7 @@ class CompositeField extends FormField {
}
}
return $this->createTag('div', $this->getAttributes(), $content);
return $this->createTag($this->getTag(), $this->getAttributes(), $content);
}
/**
@ -122,9 +138,10 @@ class CompositeField extends FormField {
*/
function SmallFieldHolder() {//return $this->FieldHolder();
$fs = $this->FieldList();
$tag = $this->getTag();
$idAtt = isset($this->id) ? " id=\"{$this->id}\"" : '';
$className = ($this->columnCount) ? "field CompositeField {$this->extraClass()} multicolumn" : "field CompositeField {$this->extraClass()}";
$content = "<div class=\"$className\"$idAtt>";
$content = "<$tag class=\"$className\"$idAtt>";
foreach($fs as $subfield) {//echo ' subf'.$subfield->getName();
if($this->columnCount) {
@ -135,7 +152,7 @@ class CompositeField extends FormField {
$content .= $subfield->SmallFieldHolder() . " ";
}
}
$content .= "</div>";
$content .= "</$tag>";
return $content;
}

12
tests/forms/CompositeFieldTest.php
View File

@ -29,4 +29,16 @@ class CompositeFieldTest extends SapphireTest {
$this->assertEquals(2, $compositeOuter->fieldPosition('B'));
}
function testTag() {
$composite = new CompositeField(
new TextField('A'),
new TextField('B')
);
$this->assertStringStartsWith('<div', trim($composite->FieldHolder()));
$this->assertStringEndsWith('/div>', trim($composite->FieldHolder()));
$composite->setTag('fieldset');
$this->assertStringStartsWith('<fieldset', trim($composite->FieldHolder()));
$this->assertStringEndsWith('/fieldset>', trim($composite->FieldHolder()));
}
}