diff --git a/library/ZendAfi/Form/Configuration/ArticleWidget.php b/library/ZendAfi/Form/Configuration/ArticleWidget.php index 6b62053735120032bb302d82830dc83215a80c89..d019468266445778091a38af497ddcba168f4435 100644 --- a/library/ZendAfi/Form/Configuration/ArticleWidget.php +++ b/library/ZendAfi/Form/Configuration/ArticleWidget.php @@ -25,11 +25,11 @@ class ZendAfi_Form_Configuration_ArticleWidget extends ZendAfi_Form { public function init() { Class_ScriptLoader::getInstance() ->addJQueryReady( - 'formSelectToggleVisibilityForElement("input[name=\'display_order\']", "#fieldset-datas tr:nth-child(3)", ["DateCreationDesc", "DebutPublicationDesc", "EventDebut", "Random", "CommentCount"]);' + 'formSelectToggleVisibilityForElement("input[name=\'display_order\']", "#fieldset-datas tr:nth-child(2)", ["DateCreationDesc", "DebutPublicationDesc", "EventDebut", "Random", "CommentCount"]);' - . 'formSelectToggleVisibilityForElement("input[name=\'display_order\']", "#fieldset-datas tr:nth-child(4)", "Random");' + . 'formSelectToggleVisibilityForElement("input[name=\'display_order\']", "#fieldset-datas tr:nth-child(3)", "Random");' - . 'checkBoxToggleVisibilityForElement("#allow_link_on_title", "#fieldset-affichage tr:nth-child(4)", true);'); + . 'checkBoxToggleVisibilityForElement("#allow_link_on_title", "#fieldset-affichage tr:nth-child(3)", true);'); parent::init(); @@ -107,16 +107,14 @@ class ZendAfi_Form_Configuration_ArticleWidget extends ZendAfi_Form { 'general', ['legend' => $this->_('Généralités')]) - ->addDisplayGroup(['articles_selector', - 'display_order', - 'nb_aff', - 'nb_analyse'], - 'datas', + ->addDisplayGroup(['articles_selector'], + 'articles', ['legend' => $this->_('Articles à afficher')]) - ->addDisplayGroup(['articles_selector', 'display_order', 'nb_aff', 'nb_analyse'], + + ->addDisplayGroup(['display_order', 'nb_aff', 'nb_analyse'], 'datas', - ['legend' => $this->_('Articles à afficher')]) + ['legend' => $this->_('Mode sélection')]) ->addDisplayGroup(['boite', 'display_titles_only', diff --git a/library/ZendAfi/View/Helper/RenderForm.php b/library/ZendAfi/View/Helper/RenderForm.php index 7012d7e7b5271f836dc96e828c42e904788099f8..2cd9b4353879bfdf0e3b7bb4baf5dee44e0bf45f 100644 --- a/library/ZendAfi/View/Helper/RenderForm.php +++ b/library/ZendAfi/View/Helper/RenderForm.php @@ -101,15 +101,9 @@ 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'], - $input_tag_params]; - + ['tag' => 'td', + 'class' => 'gauche']]; $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 9b78d439fcbe4d5f9bfe29f0310e50aec5540521..ad09ab69c83179b70b41bc45c2398813db12fc37 100644 --- a/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php +++ b/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php @@ -52,18 +52,6 @@ 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());