From bbea0a0d39c3c81ff5191bc4c08d1264313813e0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 25 Jul 2007 12:00:15 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20positionnement=20sur=20la=20ligne=20en?=
 =?UTF-8?q?=20=E9dition=20Ajout=20bouton=20annul=E9=20Ajout=20confirmation?=
 =?UTF-8?q?=20de=20suppression=20d'une=20ligne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/dict.php         | 24 ++++++++++++++++++++----
 htdocs/langs/en_US/admin.lang |  2 ++
 htdocs/langs/fr_FR/admin.lang |  4 ++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 7ef1e55b5eb..73d1c9be4a8 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -200,6 +200,7 @@ $msg='';
 
 
 $sortfield=$_GET["sortfield"];
+$sortorder=$_GET["sortorder"];
 
 /*
  * Actions ajout ou modification d'une entr�e dans un dictionnaire de donn�e
@@ -312,7 +313,12 @@ if ($_POST["actionadd"] || $_POST["actionmodify"])
     $_GET["id"]=$_POST["id"];       // Force affichage dictionnaire en cours d'edition
 }
 
-if ($_GET["action"] == 'delete')       // delete
+if ($_POST["actioncancel"])
+{
+	$_GET["id"]=$_POST["id"];       // Force affichage dictionnaire en cours d'edition
+}
+
+if ($_POST['action'] == 'confirm_delete' && $_POST['confirm'] == 'yes')       // delete
 {
     if ($tabrowid[$_GET["id"]]) { $rowidcol=$tabrowid[$_GET["id"]]; }
     else { $rowidcol="rowid"; }
@@ -386,6 +392,15 @@ print_fiche_titre($titre,'','setup');
 print $langs->trans("DictionnaryDesc")."<br>\n";
 print "<br>\n";
 
+  /*
+   * Confirmation de la suppression de la ligne
+   */
+  if ($_GET['action'] == 'delete')
+  {
+  	$html = new Form($db);
+  	$html->form_confirm($_SERVER["PHP_SELF"].'?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$_GET["rowid"].'&amp;code='.$_GET["code"].'&amp;id='.$_GET["id"], $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete');
+    print '<br>';
+  }
 
 /*
  * Affichage d'un dictionnaire particulier
@@ -534,8 +549,9 @@ if ($_GET["id"])
                 	print '<form action="dict.php" method="post">';
                 	print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
                 	print '<input type="hidden" name="rowid" value="'.$_GET["rowid"].'">';
-					fieldList($fieldlist,$obj);
-					print '<td colspan="3" align="right"><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'"></td>';
+                	fieldList($fieldlist,$obj);
+                	print '<td colspan="3" align="right"><a name="'.($obj->rowid?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                	print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
                 }
                 else
                 {                	
@@ -573,7 +589,7 @@ if ($_GET["id"])
                   print "</td>";
 				  
                   if ($iserasable) {
-                  	print '<td align="center"><a href="dict.php?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$_GET["id"].'&amp;action=modify">'.img_edit().'</a></td>';
+                  	print '<td align="center"><a href="dict.php?sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.($obj->rowid?$obj->rowid:$obj->code).'&amp;code='.$obj->code.'&amp;id='.$_GET["id"].'&amp;action=modify#'.($obj->rowid?$obj->rowid:$obj->code).'">'.img_edit().'</a></td>';
                   } else {
                     print '<td>&nbsp;</td>';   
                   }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 25edae254c4..2a9be21eba4 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -765,3 +765,5 @@ DetailLevel=Niveau (-1:menu top, 0:entete menu, >0 menu et sous menu)
 ModifMenu=Menu change
 DeleteMenu=Delete menu entry
 ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
+DeleteLine=Delete line
+ConfirmDeleteLine=Are you sure you want to delete this line ?
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 4a8666bb4d9..6be45332b0e 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -771,5 +771,5 @@ DetailLevel=Niveau (-1:menu top, 0:entete menu, >0 menu et sous menu)
 ModifMenu=Modification du menu
 DeleteMenu=Effacer entr�e de menu
 ConfirmDeleteMenu=Etes-vous sur de vouloir supprimer l'entr�e de menu <b>%s</b> ?
-
-
+DeleteLine=Suppression de ligne
+ConfirmDeleteLine=�tes-vous s�r de vouloir effacer cette ligne ?
\ No newline at end of file
-- 
GitLab