New: not reload page with dialog confirm

htdocs/core/class/html.form.class.php

@@ -2041,7 +2041,8 @@ class Form
         	$autoOpen=true;
         	$dialogconfirm='dialog-confirm';
         	if (! is_int($useajax)) {
-        		list($useajax,$button) = explode(',',$useajax);
+        		$button=$useajax;
+        		$useajax=1;
         		$autoOpen=false;
         		$dialogconfirm.='-'.$button;
         	}
@@ -2049,7 +2050,7 @@ class Form
             $pageno=($useajax == 2?$page.'&confirm=no':'');
 
             // New code using jQuery only
-            $formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;>';
+            $formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
             if (! empty($more)) $formconfirm.= '<p>'.$more.'</p>';
             $formconfirm.= img_help('','').' '.$question;
             $formconfirm.= '</div>'."\n";

htdocs/product/fiche.php

@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2006      Auguria SARL         <info@auguria.org>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
@@ -1029,9 +1029,9 @@ if ($id || $ref)
 		dol_fiche_head($head, 'card', $titre, 0, $picto);
 
 		// Confirmation de la suppression de la facture
-		if ($action == 'delete')
+		if ($action == 'delete' || ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX))
 		{
-			$ret=$html->form_confirm("fiche.php?id=".$product->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,2);
+			$ret=$html->form_confirm("fiche.php?id=".$product->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
 			if ($ret == 'html') print '<br>';
 		}
 
@@ -1193,7 +1193,7 @@ else if ($action != 'create')
 
 
 // Clone confirmation
-if ($action == 'clone')
+if ($action == 'clone' || ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX) )
 {
 	// Create an array for form
 	$formquestion=array(
@@ -1203,7 +1203,7 @@ if ($action == 'clone')
 	array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true)
 	);
 	// Paiement incomplet. On demande si motif = escompte ou autre
-	$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$product->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$product->ref),'confirm_clone',$formquestion,'yes',2,230,600);
+	$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$product->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$product->ref),'confirm_clone',$formquestion,'yes','action-clone',230,600);
 }
 
 
@@ -1222,18 +1222,30 @@ if ($action == '')
 		if ($product->no_button_edit <> 1)
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$product->id.'">'.$langs->trans("Modify").'</a>';
 
-		if ($product->no_button_copy <> 1)
+		if ($product->no_button_copy <> 1) {
+			if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX) {
+				print '<span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span>'."\n";
+			} else {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$product->id.'">'.$langs->trans("ToClone").'</a>';
 			}
+		}
+	}
 
 	$product_is_used = $product->verif_prod_use($product->id);
 	if (($product->type == 0 && $user->rights->produit->supprimer)
 	 || ($product->type == 1 && $user->rights->service->supprimer))
 	{
 		if (! $product_is_used && $product->no_button_delete <> 1)
+		{
+			if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
+			{
+				print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
+			}
+			else
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$product->id.'">'.$langs->trans("Delete").'</a>';
 			}
+		}
 		else
 		{
 			print '<a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a>';

htdocs/societe/soc.php

@@ -1331,7 +1331,7 @@ else
 		if ($action == 'delete' || ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX))
 		{
 			$html = new Form($db);
-			$ret=$html->form_confirm($_SERVER["PHP_SELF"]."?socid=".$soc->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"1,action-delete");
+			$ret=$html->form_confirm($_SERVER["PHP_SELF"]."?socid=".$soc->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"action-delete");
 			if ($ret == 'html') print '<br>';
 		}
 

htdocs/theme/auguria/style.css.php

@@ -955,7 +955,7 @@ span.tabspan {
 
 /* Nouvelle syntaxe a utiliser */
 
-.butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
+.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
 	font-family: <?php print $fontlist ?>;
 	font-weight: bold;
 	background: white;
@@ -996,7 +996,7 @@ span.tabspan {
 	cursor: not-allowed;
 }
 
-span.butActionDelete    {
+span.butAction, span.butActionDelete {
 	cursor: pointer;
 }