From 8cadbe74ae501dd6eaf66aa8f21b99ac7dbf4606 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 31 Oct 2004 13:34:08 +0000
Subject: [PATCH] =?UTF-8?q?Qual:=20Uniformisation=20du=20code=20en=20passa?=
 =?UTF-8?q?nt=20tous=20les=20tableaux=20qui=20utilisaient=20print=5Fliste?=
 =?UTF-8?q?=5Ffield=5Ftitre=20et=20print=5Fliste=5Ffield=5Ftitre=5Fnew=20s?=
 =?UTF-8?q?ur=20le=20mod=E8le=20de=20print=5Fliste=5Ffield=5Ftitre=5Fnew?=
 =?UTF-8?q?=20(plus=20complet,=20l'autre=20fonction=20a=20=E9t=E9=20suppri?=
 =?UTF-8?q?m=E9e).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/lib/functions.inc.php        | 50 ++++++++---------------------
 htdocs/lolix/societe/activation.php | 15 +++++----
 htdocs/societe.php                  |  8 ++---
 3 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 5f54473d177..3684c6bfb27 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier			  <benoit.mortier@opensides.be>
+ * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -933,45 +933,23 @@ function transcoS2L($zonein,$devise)
 		\param	options ("" par defaut)
 */
 
-function print_liste_field_titre($name, $file, $field, $begin="", $options="")
- {
-  global $conf;
-
-  print $name."&nbsp;";
-  print '<a href="'.$file.'?sortfield='.$field.'&amp;sortorder=asc&amp;begin='.$begin.$options.'">';
-  print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow.png" border="0" alt="A-Z"></a>';
-  print '<a href="'.$file.'?sortfield='.$field.'&amp;sortorder=desc&amp;begin='.$begin.$options.'">';
-  print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow.png" border="0" alt="Z-A"></a>';
-}
-
-/*!
-		\brief affichage du titre d'une liste avec possibilité de tri et de choix du type de la balise td
-		\param	name
-		\param	file
-		\param	field
-		\param	begin ("" par defaut)
-		\param	options ("" par defaut)
-		\param	td ("" par defaut)
-		\param	sortfield ("" par defaut)
-*/
-
-function print_liste_field_titre_new($name, $file, $field, $begin="", $options="", $td="", $sortfield="")
- {
-  global $conf;
-  if ($sortfield == $field)
+function print_liste_field_titre($name, $file, $field, $begin="", $options="", $td="", $sortfield="")
+{
+    global $conf;
+    if ($sortfield == $field)
     {
-  print '<td class="menusel" '. $td.'>';
+        print '<td class="menusel" '. $td.'>';
     }
-  else
+    else
     {
-  print '<td '. $td.'>';
+        print '<td '. $td.'>';
     }
-  print $name."&nbsp;";
-  print '<a href="'.$file.'?sortfield='.$field.'&amp;sortorder=asc&amp;begin='.$begin.$options.'">';
-  print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow.png" border="0" alt="A-Z"></a>';
-  print '<a href="'.$file.'?sortfield='.$field.'&amp;sortorder=desc&amp;begin='.$begin.$options.'">';
-  print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow.png" border="0" alt="Z-A"></a>';
-  print "</td>";
+    print $name."&nbsp;";
+    print '<a href="'.$file.'?sortfield='.$field.'&amp;sortorder=asc&amp;begin='.$begin.$options.'">';
+    print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow.png" border="0" alt="A-Z"></a>';
+    print '<a href="'.$file.'?sortfield='.$field.'&amp;sortorder=desc&amp;begin='.$begin.$options.'">';
+    print '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow.png" border="0" alt="Z-A"></a>';
+    print "</td>";
 }
 
 /*!
diff --git a/htdocs/lolix/societe/activation.php b/htdocs/lolix/societe/activation.php
index 59aa86df0db..7c113a93f5c 100644
--- a/htdocs/lolix/societe/activation.php
+++ b/htdocs/lolix/societe/activation.php
@@ -19,8 +19,11 @@
  * $Source$
  *
  */
+
 require("./pre.inc.php");
 
+$langs->load("companies");
+
 llxHeader("","","Lolix - Société a activer");
 
 /*
@@ -65,13 +68,11 @@ if ($result)
     {
       $sortorder="DESC";
     }
-  print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
-  print '<TR class="liste_titre">';
-  print "<TD valign=\"center\">";
-  print_liste_field_titre("Société",$PHP_SELF,"s.nom");
-  print "</td><td>";
-  print_liste_field_titre("Ville",$PHP_SELF,"s.ville");
-  print "</td><td>&nbsp;</td>";
+  print '<table class="noborder" width="100%">';
+  print '<tr class="liste_titre">';
+  print_liste_field_titre($langs->trans("Company"),$PHP_SELF,"s.nom","","",'valign=\"center\"');
+  print_liste_field_titre($langs->trans("Town"),$PHP_SELF,"s.ville");
+  print "<td>&nbsp;</td>";
 
   print "</tr>\n";
   $var=True;
diff --git a/htdocs/societe.php b/htdocs/societe.php
index f81f4678352..04146a4e147 100644
--- a/htdocs/societe.php
+++ b/htdocs/societe.php
@@ -155,13 +155,11 @@ if ($result)
     }
 
 
-  print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">';
+  print '<table class="noborder" width="100%">';
   print '<tr class="liste_titre">';
-  print '<td>';
   print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom", $params);
-  print '</td><td width="25%">';
-  print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville",$params);
-  print '</td><td colspan="2" align="center">'.$langs->trans("Cards").'</td>';
+  print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville",$params,"",'width="25%"');
+  print '<td colspan="2" align="center">'.$langs->trans("Cards").'</td>';
   print "</tr>\n";
 
   print '<form method="get" action="societe.php">';