Prise en charge bouton Annuler sur les réservations

application/modules/opac/controllers/RechercheController.php

@@ -517,7 +517,7 @@ class RechercheController extends ZendAfi_Controller_Action {
 																								 'allowEmpty' => false))
 			->addDisplayGroup(array('code_annexe'), 'group', array('legend' => 'Site de retrait'))
 			->addElement('Submit', 'Valider')
-			->addElement('Submit', 'Annuler', array('onclick' => 'javascript:opacDialogClose();return false;'));
+			->addElement('Button', 'Annuler', array('onclick' => 'opacDialogClose();return false;'));
 			
 		$radio = $form->getElement('code_annexe');
 		foreach ($annexes as $annexe)
@@ -525,7 +525,7 @@ class RechercheController extends ZendAfi_Controller_Action {
 		$radio->setValue($this->_getParam('code_annexe'));
 
 		$this->renderPopupResult($this->view->_('Réservation'),
-														 $form->render());
+														 $this->view->renderForm($form));
 	}
 
 

public/opac/css/global.css

@@ -519,16 +519,14 @@ form#calendar_select_categorie {
     margin-bottom: 10px;
 }
 
-.zend_form input, .zend_form textarea {
+.zend_form input, .zend_form textarea, .zend_form button {
     padding:2px;
     font-family: "Verdana"
 }
 
 input {
     border-collapse:collapse;
-    color:#666666;
     font-family:Arial;
-    font-size:11px;
     padding-left:2px;
 }
 
@@ -1155,11 +1153,11 @@ body.abonne_multimedia-hold-day #hold-day.calendar {
 }
 
 
-.form input[type="submit"] {
+.form input[type="submit"],
+.form button {
     border: 2px outset buttonface;
     width: 200px;
     margin: 5px auto;
-    display: block;
 }
 
 
@@ -2096,7 +2094,8 @@ div.ui-dalog.ajout-panier {
     width:350px;
 }
 
-.ui-dialog input {
+.ui-dialog input,
+.ui-dialog button {
     font-size: 1.2em;
 }
 

public/opac/js/lien_reserver.js

@@ -14,7 +14,7 @@ function openDialogExemplaires(titre, noticeAjax, anchor) {
 	    var dataTable={title: titre, content: data};
 	    var modal = opacDialog(dialog_reserver,
 														 dataTable,
-														 'reservation-exempalires',
+														 'reservation-exemplaires',
 														 function() { removeLoadingClass(anchor);},
 														 function() { $('div.ui-widget-overlay').click(closeDialogExemplaires);	}
 														,710,300);

public/opac/js/subModal.js

@@ -37,6 +37,7 @@ function opacDialogFromData(data) {
 
 function opacDialogClose() {
 	$('#opac-dialog').dialog('close');
+	$('#opac-dialog').remove();
 }