Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

<span>$label</span> only when filled #2290

Closed
wants to merge 4 commits into from
Closed

<span>$label</span> only when filled #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
984e30c
<span>$label</span> only when filled
Slamdunk Sep 3, 2012
0f0578e
Allow "empty" strings like '0'
Slamdunk Sep 5, 2012
ef37375
Added test for removing <span> tag on FormRow
Slamdunk Sep 20, 2012
daa214f
Better test name
Slamdunk Sep 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions library/Zend/Form/View/Helper/FormRow.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,17 @@ public function render(ElementInterface $element)
$labelClose = $labelHelper->closeTag();
}

if ($label !== '') {
$label = '<span>' . $label . '</span>';
}

switch ($this->labelPosition) {
case self::LABEL_PREPEND:
$markup = $labelOpen . '<span>' . $label . '</span>' . $elementString . $labelClose;
$markup = $labelOpen . $label . $elementString . $labelClose;
break;
case self::LABEL_APPEND:
default:
$markup = $labelOpen . $elementString . '<span>' . $label . '</span>' . $labelClose;
$markup = $labelOpen . $elementString . $label . $labelClose;
break;
}

Expand Down
16 changes: 16 additions & 0 deletions tests/ZendTest/Form/View/Helper/FormRowTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,20 @@ public function testSetLabelAttributes()
$this->helper->setLabelAttributes(array('foo', 'bar'));
$this->assertEquals(array(0 => 'foo', 1 => 'bar'), $this->helper->getLabelAttributes());
}

public function testWhenUsingIdAndLabelBecomesEmptyRemoveSpan()
{
$element = new Element('foo');
$element->setLabel('The value for foo:');

$markup = $this->helper->__invoke($element);
$this->assertContains('<span', $markup);
$this->assertContains('</span>', $markup);

$element->setAttribute('id', 'foo');

$markup = $this->helper->__invoke($element);
$this->assertNotContains('<span', $markup);
$this->assertNotContains('</span>', $markup);
}
}