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 * Copyright (C) 2004 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Christophe Combelles * * 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." "; - print ''; - print 'A-Z'; - print ''; - print 'Z-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 ''; + print ''; } - else + else { - print ''; + print ''; } - print $name." "; - print ''; - print 'A-Z'; - print ''; - print 'Z-A'; - print ""; + print $name." "; + print ''; + print 'A-Z'; + print ''; + print 'Z-A'; + print ""; } /*! 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 ''; - print ''; - print ""; + print '
"; - print_liste_field_titre("Société",$PHP_SELF,"s.nom"); - print ""; - print_liste_field_titre("Ville",$PHP_SELF,"s.ville"); - print " 
'; + print ''; + 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 ""; print "\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 '
 
'; + print '
'; print ''; - print ''; + print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville",$params,"",'width="25%"'); + print ''; print "\n"; print '';
'; print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom", $params); - print ''; - print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville",$params); - print ''.$langs->trans("Cards").''.$langs->trans("Cards").'