From 2a4f9ce87049a73ddba517a93a7c1eca26fb6275 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 31 Oct 2004 12:54:56 +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).=20Trad:=20Et=20encore=20de=20la=20traduction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/adherents/cotisations.php | 14 +++--------
 htdocs/adherents/liste.php       | 43 +++++++++-----------------------
 2 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index dc2b95c8b11..0bef346136b 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -161,17 +161,9 @@ if ($result)
   print "<table class=\"border\">";
 
   print '<tr class="liste_titre">';
-  print '<td>';
-  print_liste_field_titre("Date<BR>","cotisations.php","c.dateadh","&page=$page&statut=$statut");
-  print "</td>\n";
-
-  print '<td>';
-  print_liste_field_titre("Montant<BR>","cotisations.php","c.cotisation","&page=$page&statut=$statut");
-  print "</td>\n";
-
-  print '<td>';
-  print_liste_field_titre("Prenom Nom<BR>","cotisations.php","d.nom","&page=$page&statut=$statut");
-  print "</td>\n";
+  print_liste_field_titre("Date","cotisations.php","c.dateadh","&page=$page&statut=$statut");
+  print_liste_field_titre("Montant","cotisations.php","c.cotisation","&page=$page&statut=$statut");
+  print_liste_field_titre("Prenom Nom","cotisations.php","d.nom","&page=$page&statut=$statut");
 
   if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0){
     print '<td>';
diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
index 93a239a8900..b5e2ac9d0eb 100644
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -74,11 +74,11 @@ if ($result)
   $num = $db->num_rows();
   $i = 0;
   
-  $titre="Liste des adhérents";
+  $titre=$langs->trans("MembersList");
   if (isset($_GET["statut"])) {
-    if ($statut == -1) { $titre="Liste des adhérents à valider"; }
-    if ($statut == 1) { $titre="Liste des adhérents valides"; }
-    if ($statut == 0) { $titre="Liste des adhérents résiliés"; }
+    if ($statut == -1) { $titre=$langs->trans("MembersListToValid"); }
+    if ($statut == 1) { $titre=$langs->trans("MembersListValid"); }
+    if ($statut == 0) { $titre=$langs->trans("MembersListResiliated"); }
   }
   elseif ($_POST["action"] == 'search') {
       $titre="Liste des adhérents répondant aux critères";
@@ -91,35 +91,16 @@ if ($result)
 
   print_barre_liste($titre, $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield",$sortfield,$sortorder,'',$num);
 
-  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("Prenom Nom / Société","liste.php","d.nom","&page=$page&statut=$statut");
-  print "</td>\n";
-
-  print "<td>";
-  print_liste_field_titre("Date cotisation","liste.php","t.cotisation","&page=$page&statut=$statut");
-  print "</td>\n";
-
-  print "<td>";
-  print_liste_field_titre("Email","liste.php","d.email","&page=$page&statut=$statut");
-  print "</td>\n";
-
-  print "<td>";
-  print_liste_field_titre($langs->trans("Type"),"liste.php","t.libelle","&page=$page&statut=$statut");
-  print "</td>\n";
-
-  print "<td>";
-  print_liste_field_titre("Personne","liste.php","d.morphy","&page=$page&statut=$statut");
-  print "</td>\n";
-
-  print "<td>";
-  print_liste_field_titre($langs->trans("Status"),"liste.php","d.statut","&page=$page&statut=$statut");
-  print "</td>\n";
-
-  print "<td>Action</td>\n";
+  print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),"liste.php","d.nom","&page=$page&statut=$statut","","",$sortfield);
+  print_liste_field_titre($langs->trans("DateAbonment"),"liste.php","t.cotisation","&page=$page&statut=$statut","","",$sortfield);
+  print_liste_field_titre($langs->trans("EMail"),"liste.php","d.email","&page=$page&statut=$statut","","",$sortfield);
+  print_liste_field_titre($langs->trans("Type"),"liste.php","t.libelle","&page=$page&statut=$statut","","",$sortfield);
+  print_liste_field_titre($langs->trans("Person"),"liste.php","d.morphy","&page=$page&statut=$statut","","",$sortfield);
+  print_liste_field_titre($langs->trans("Status"),"liste.php","d.statut","&page=$page&statut=$statut","","",$sortfield);
+  print "<td>".$langs->trans("Action")."</td>\n";
   print "</tr>\n";
     
   $var=True;