From e1beff87ce912b115dda633b6a1f8fe58a8847ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jul 2009 15:04:58 +0000 Subject: [PATCH] Look: Minor fix in themes --- htdocs/adherents/liste.php | 10 +- htdocs/compta/paiement/cheque/liste.php | 123 ++++++++++++------------ htdocs/html.formfile.class.php | 2 +- htdocs/projet/activity/index.php | 2 +- htdocs/projet/index.php | 6 +- htdocs/projet/liste.php | 13 ++- 6 files changed, 78 insertions(+), 78 deletions(-) diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 75bbc7d09ee..d6e498bc30d 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -178,17 +178,17 @@ if ($resql) print_liste_field_titre($langs->trans("EMail"),"liste.php","d.email",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),"liste.php","d.statut,d.datefin",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("EndSubscription"),"liste.php","d.datefin",$param,"","",$sortfield,$sortorder); - print ''.$langs->trans("Action")."\n"; + print_liste_field_titre($langs->trans("Action"),"liste.php","",$param,"",'width="60" align="center"',$sortfield,$sortorder); print "\n"; // Lignes des champs de filtre print '
'; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -198,7 +198,7 @@ if ($resql) print ' '; - print ''; + print ''; print ''; print ' '; @@ -301,7 +301,7 @@ if ($resql) if ($num > $conf->liste_limit) { - print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,''); + print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,''); } } else diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index e96865d8836..543a1dabaa7 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -1,6 +1,6 @@ - * Copyright (C) 2007-2008 Laurent Destailleur + * Copyright (C) 2007-2009 Laurent Destailleur * Copyright (C) 2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + /** - \file htdocs/compta/paiement/cheque/liste.php - \ingroup compta - \brief Page liste des bordereau de remise de cheque - \version $Id$ -*/ + * \file htdocs/compta/paiement/cheque/liste.php + * \ingroup compta + * \brief Page liste des bordereau de remise de cheque + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); @@ -38,7 +38,7 @@ $result = restrictedArea($user, 'banque', '',''); $page=$_GET["page"]; $sortorder=$_GET["sortorder"]; $sortfield=$_GET["sortfield"]; - + $limit = $conf->liste_limit; $offset = $limit * $page ; if (! $sortorder) $sortorder="DESC"; @@ -49,7 +49,7 @@ $accountstatic=new Account($db); /* - * Affichage + * View */ llxHeader('',$langs->trans("ChequesReceipts")); @@ -63,7 +63,7 @@ $sql.= " WHERE bc.fk_bank_account = ba.rowid"; $sql.= " AND bc.entity = ".$conf->entity; if ($_GET["search_montant"]) { - $sql.=" AND bc.amount=".price2num($_GET["search_montant"]); + $sql.=" AND bc.amount=".price2num($_GET["search_montant"]); } $sql.= " ORDER BY $sortfield $sortorder"; $sql.= $db->plimit( $limit+1 ,$offset); @@ -73,77 +73,78 @@ $resql = $db->query($sql); if ($resql) { - $num = $db->num_rows($resql); - $i = 0; + $num = $db->num_rows($resql); + $i = 0; - print_barre_liste($langs->trans("ChequesReceipts"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("ChequesReceipts"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); - print ''; - print ''; - print ''; - print_liste_field_titre($langs->trans("Ref"),"liste.php","bc.number","",$paramlist,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateCreation"),"liste.php","dp","",$paramlist,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("NbOfCheques"),"liste.php","bc.nbcheque","",$paramlist,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Amount"),"liste.php","bc.amount","",$paramlist,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),"liste.php","bc.statut","",$paramlist,'align="right"',$sortfield,$sortorder); - print "\n"; + print ''; + print '
'; + print ''; + print_liste_field_titre($langs->trans("Ref"),"liste.php","bc.number","",$paramlist,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateCreation"),"liste.php","dp","",$paramlist,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("NbOfCheques"),"liste.php","bc.nbcheque","",$paramlist,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Amount"),"liste.php","bc.amount","",$paramlist,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),"liste.php","bc.statut","",$paramlist,'align="right"',$sortfield,$sortorder); + print "\n"; - // Lignes des champs de filtre - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; + // Lignes des champs de filtre + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; - $var=true; - while ($i < min($num,$limit)) - { - $objp = $db->fetch_object($resql); - $var=!$var; - print ""; + $var=true; + while ($i < min($num,$limit)) + { + $objp = $db->fetch_object($resql); + $var=!$var; + print ""; // Num ref cheque - print ''; - // Date - print ''; + // Date + print ''; - // Banque - print ''; - - // Nb of cheques - print ''; + // Banque + print ''; - // Montant - print ''; + // Nb of cheques + print ''; + + // Montant + print ''; // Statut - print '\n"; - $i++; - } - print "
    '; - print ''; - print ''; - print ''; - print '
    '; + print ''; + print ''; + print ''; + print '
'; + print ''; $checkdepositstatic->rowid=$objp->rowid; $checkdepositstatic->statut=$objp->statut; $checkdepositstatic->number=$objp->ref; print $checkdepositstatic->getNomUrl(1); print ''.dol_print_date($objp->dp,'day').''.dol_print_date($objp->dp,'day').''; - if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; - else print ' '; - print ''.$objp->nbcheque.''; + if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; + else print ' '; + print ''.price($objp->amount).''.$objp->nbcheque.''.price($objp->amount).''; + print ''; print $checkdepositstatic->LibStatut($objp->statut,5); - print "
"; - print "\n"; + print "\n"; + $i++; + } + print ""; + print "\n"; } else { - dol_print_error($db); + dol_print_error($db); } $db->close(); diff --git a/htdocs/html.formfile.class.php b/htdocs/html.formfile.class.php index 759d9e6324f..76334efd0e8 100644 --- a/htdocs/html.formfile.class.php +++ b/htdocs/html.formfile.class.php @@ -436,7 +436,7 @@ class FormFile print_liste_field_titre($langs->trans("Documents2"),$_SERVER["PHP_SELF"],"name","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Size"),$_SERVER["PHP_SELF"],"size","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"date","",$param,'align="center"',$sortfield,$sortorder); - print ' '; + print_liste_field_titre('','',''); print ''; $var=true; diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 661c370d9ab..fc7238d7f56 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -59,7 +59,7 @@ print ''; print ''; print ''; -print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder); +print ''; print ''; print "\n"; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 779f42f573c..3d5238d193e 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ print '
'.$langs->trans("Project").''.$langs->trans("NbOpenTasks").'
'; print ''; print ''; print_liste_field_titre($langs->trans("Project"),"index.php","","","","",$sortfield,$sortorder); -print ''; +print_liste_field_titre($langs->trans("NbOpenTasks"),"","","","",'align="right"',$sortfield,$sortorder); print "\n"; $sql = "SELECT p.title, p.rowid, count(t.rowid)"; @@ -99,7 +99,7 @@ print '
'.$langs->trans("NbOpenTasks").'
'; print ''; print ''; print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","","",$sortfield,$sortorder); -print ''; +print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right"',$sortfield,$sortorder); print "\n"; $sql = "SELECT count(p.rowid) as nb, s.nom, s.rowid as socid"; diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php index 345887b8a17..15baee0f062 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/liste.php @@ -113,23 +113,22 @@ if ($resql) print_liste_field_titre($langs->trans("Label"),"liste.php","p.title","","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom","","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("OfficerProject"),"liste.php","","","","",$sortfield,$sortorder); - print ''; + print_liste_field_titre('','',''); print "\n"; print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print '"; + print ''; + print ''; print "\n"; while ($i < $num)
'.$langs->trans("NbOfProjects").'
 
'; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; print ''; print ' '; - print "