diff --git a/library/ZendAfi/View/Helper/RenderForm.php b/library/ZendAfi/View/Helper/RenderForm.php index 2cd9b4353879bfdf0e3b7bb4baf5dee44e0bf45f..7012d7e7b5271f836dc96e828c42e904788099f8 100644 --- a/library/ZendAfi/View/Helper/RenderForm.php +++ b/library/ZendAfi/View/Helper/RenderForm.php @@ -101,9 +101,15 @@ class ZendAfi_View_Helper_RenderForm extends ZendAfi_View_Helper_BaseHelper { switch ($name) { case 'label': + $input_tag_params = ['tag' => 'td', + 'class' => 'gauche']; + + if ( !trim($element->getLabel()) ) + $input_tag_params['colspan'] = 2; + $newDecorators[] = [['input_data' => 'HtmlTag'], - ['tag' => 'td', - 'class' => 'gauche']]; + $input_tag_params]; + $decorator->setOptions([]); $decorator->setOption('wrap', ['tag' => 'td', 'attribs' => ['class' => 'droite']]); diff --git a/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php b/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php index ad09ab69c83179b70b41bc45c2398813db12fc37..9b78d439fcbe4d5f9bfe29f0310e50aec5540521 100644 --- a/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php +++ b/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php @@ -52,6 +52,18 @@ class Admin_AccueilControllerCmsWithDefaultDiaporamaNavigationTest extends Admin } + /** @test */ + public function inputIdItemsTDShouldHaveColspanTwo() { + $this->assertXPath('//td[@colspan="2"]//input[@name="id_items"]'); + } + + + /** @test */ + public function inputTitreTDShouldNotHaveColspan() { + $this->assertXPath('//td[not(@colspan)]//input[@name="titre"]'); + } + + /** @test */ public function inputIdItemsShouldContains1and2() { $this->assertXPath('//form//input[@name="id_items"][@value="1-2"]', $this->_response->getBody());