diff --git a/application/modules/opac/controllers/AbonneController.php b/application/modules/opac/controllers/AbonneController.php index 855bd63f6602c104e119c8bc6cf963cb70746542..8aa0d93a6dfb8bd2109b98412ff4b11dd5738085 100644 --- a/application/modules/opac/controllers/AbonneController.php +++ b/application/modules/opac/controllers/AbonneController.php @@ -468,7 +468,6 @@ class AbonneController extends ZendAfi_Controller_Action { $form - ->addElement('submit', 'submit', array('label' => $this->_('Enregistrer'))) ->populate($user->toArray()); return $form; diff --git a/library/ZendAfi/View/Helper/Bouton.php b/library/ZendAfi/View/Helper/Bouton.php index 57e017a598accb7364431c33918af1f9c929bd76..b1c4429c91f18b02ae0b792ca60ad4f17e7a5e9e 100644 --- a/library/ZendAfi/View/Helper/Bouton.php +++ b/library/ZendAfi/View/Helper/Bouton.php @@ -70,7 +70,7 @@ class ZendAfi_View_Helper_Bouton extends ZendAfi_View_Helper_BaseHelper $picto=URL_ADMIN_IMG . '/ico/coche_verte.gif'; $texte=$this->translate()->_("Valider"); if(!$largeur) $largeur="120px"; - $onclick='var form=$(this).parents(\'form\'); if (!form.size()) form=$(this).parents(\'table\').prev(); form.submit(); return false;'; + $onclick='var form=$(this).parents(\'form\'); if (!form.size()) form=$(this).parents(\'table\').prevAll(\'form\'); form.submit(); return false;'; } elseif($attrib[1]=="RETOUR") { diff --git a/public/opac/css/global.css b/public/opac/css/global.css index 4a6a4a601bc277303b7dcdd50e4e35e1632ea2a9..e2868a219cbd877708597b17e04c0816913bbb93 100644 --- a/public/opac/css/global.css +++ b/public/opac/css/global.css @@ -434,10 +434,17 @@ form#calendar_select_categorie { vertical-align: middle; } -#abonne_edit form { + +#abonne_edit { + width: 500px; margin-left: auto; margin-right: auto; - width: 500px; + background-color: #F0F0F0; +} + + +#abonne_edit > table { + width: 100%; } #abonne_edit form label { diff --git a/tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php b/tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php index d3a239295e2b065628d2af73232071397ce32338..88a4672630fa37d9ffc46ff9f6ba8031a99cec5c 100644 --- a/tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php +++ b/tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php @@ -245,12 +245,17 @@ class AbonneControllerNewslettersEditActionTest extends AbonneControllerWithTwoN } public function testSubmitButton() { - $this->assertXPath(utf8_encode("//form//input[@type='submit']")); + $this->assertXPath("//table//div[contains(@onclick, 'form.submit()')]"); + } + + public function testBackButton() { + $this->assertXPath("//table//div[contains(@onclick, 'window.location.replace')]"); } } + class AbonneControllerNewslettersSaveActionTest extends AbonneControllerWithTwoNewslettersTestCase { public function setUp() { parent::setUp();