From 1be5ff2f35f064c6bc133a15048df0648b8d2bdc Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 4 Aug 2007 13:32:12 +0000
Subject: [PATCH] =?UTF-8?q?Ajax:=20d=E9but=20ajout=20message=20de=20confir?=
 =?UTF-8?q?mation=20de=20suppression=20ou=20autre=20afin=20d'=E9viter=20de?=
 =?UTF-8?q?=20recharger=20la=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/propal.php | 44 ++++++++++++++++++++++++++++++------------
 htdocs/lib/lib_head.js |  2 +-
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 0bc01f8ca10..bc2f23782a8 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -304,7 +304,7 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer)
 /*
  *  Cloture de la propale
  */
-if ($_POST['action'] == 'setstatut' && $user->rights->propale->cloturer)
+if ($_REQUEST['action'] == 'setstatut' && $user->rights->propale->cloturer)
 {
     if (! $_POST['cancel'])
     {
@@ -312,7 +312,7 @@ if ($_POST['action'] == 'setstatut' && $user->rights->propale->cloturer)
         $propal->fetch($_GET['propalid']);
 	// prevent browser refresh from closing proposal several times
 	if ($propal->statut==1) {
-        $propal->cloture($user, $_POST['statut'], $_POST['note']);
+        $propal->cloture($user, $_REQUEST['statut'], $_REQUEST['note']);
     }
 }
 }
@@ -1414,10 +1414,12 @@ if ($_GET['propalid'] > 0)
 	/*
 	* Formulaire cloture (signé ou non)
 	*/
-	$form_close = '<tr><td>'.$langs->trans('Note').'</td><td><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';
+	$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">';
+	$form_close.= '<table class="border" width="100%">';
+	$form_close.= '<tr><td width="150" align="left">'.$langs->trans('Note').'</td><td align="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';
 	$form_close.= $propal->note;
 	$form_close.= '</textarea></td></tr>';
-	$form_close.= '<tr><td>'.$langs->trans("CloseAs").'</td><td>';
+	$form_close.= '<tr><td width="150"  align="left">'.$langs->trans("CloseAs").'</td><td align="left">';
 	$form_close.= '<input type="hidden" name="action" value="setstatut">';
 	$form_close.= '<select name="statut">';
 	$form_close.= '<option value="0">&nbsp;</option>';
@@ -1425,17 +1427,22 @@ if ($_GET['propalid'] > 0)
 	$form_close.= '<option value="3">'.$propal->labelstatut[3].'</option>';
 	$form_close.= '</select>';
 	$form_close.= '</td></tr>';
+	$form_close.= '<tr><td align="center" colspan="2">';
+	$form_close.= '<input type="submit" class="button" name="validate" value="'.$langs->trans('Validate').'">';
+	if ($conf->use_ajax)
+	{
+		$form_close.= ' &nbsp; <input onClick="Dialog.closeInfo()" type="button" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+	}
+	else
+	{
+		$form_close.= ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+	}
+	$form_close.= '</td>';
+	$form_close.= '</tr></table></form>';
 	
 	if ($_GET['action'] == 'statut')
 	{
-		print '<form action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">';
-		print '<table class="border" width="100%">';
 		print $form_close;
-		print '<tr><td align="center" colspan="2">';
-		print '<input type="submit" class="button" name="validate" value="'.$langs->trans('Validate').'">';
-		print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-		print '</td>';
-		print '</tr></table></form>';
 	}
 
 
@@ -1496,7 +1503,20 @@ if ($_GET['propalid'] > 0)
 		// Close
 		if ($propal->statut == 1 && $user->rights->propale->cloturer)
 		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=statut">'.$langs->trans('Close').'</a>';
+			print '<div id="confirm_close" style="display:none">';
+			print $form_close."\n";
+			print '</div>'."\n";
+			
+			print '<a class="butAction" ';
+			if ($conf->use_ajax)
+			{
+				print 'href="#" onClick="info($(\'confirm_close\').innerHTML)"'."\n";
+			}
+			else
+			{
+				print 'href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=statut"';
+			}
+			print '>'.$langs->trans('Close').'</a>';
 		}
 
 		// Delete
diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js
index ef59dac6fb8..964ec87f8a5 100644
--- a/htdocs/lib/lib_head.js
+++ b/htdocs/lib/lib_head.js
@@ -669,7 +669,7 @@ function confirmDelete(linkurl,message,ok,cancel) {
 
 /*=================================================================
 	Purpose:  Affiche un message d'information
-	Input:    linkurl,message,ok,cancel
+	Input:    message
 	Author:   Regis Houssin
 	Licence:  GPL
 ==================================================================*/