From f2b6dcfe16fab168e7dffb90184a42f5d0352aff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 31 Jan 2009 00:28:30 +0000 Subject: [PATCH] Minor esthetical change --- htdocs/contact/index.php | 63 ++++++++++++++++++------------------ htdocs/langs/en_US/main.lang | 1 + htdocs/langs/fr_FR/main.lang | 1 + 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index b02af14c8ec..0148e91feeb 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -61,12 +61,12 @@ $langs->load("companies"); $titre=$langs->trans("ListOfContacts"); if ($type == "c") { - $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')'; + $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')'; $urlfiche="fiche.php"; } if ($type == "p") { - $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyProspects").')'; + $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyProspects").')'; $urlfiche="prospect/fiche.php"; } if ($type == "f") { @@ -96,10 +96,9 @@ if ($search_priv < 0) $search_priv=''; /* - * Affichage liste - * + * View */ - + llxHeader(); $form=new Form($db); @@ -174,13 +173,13 @@ if ($socid) { $sql .= " AND s.rowid = ".$socid; } -// Count total nb of records -$nbtotalofrecords = 0; -if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) -{ - $result = $db->query($sql); - $nbtotalofrecords = $db->num_rows($result); -} +// Count total nb of records +$nbtotalofrecords = 0; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); +} // Add order and limit if($_GET["view"] == "recent") { @@ -198,13 +197,13 @@ $result = $db->query($sql); if ($result) { $contactstatic=new Contact($db); - + $begin=$_GET["begin"]; - + $num = $db->num_rows($result); $i = 0; - print_barre_liste($titre ,$page, "index.php", '&begin='.$begin.'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($titre ,$page, "index.php", '&begin='.$begin.'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords); print '
'; print ''; @@ -215,7 +214,7 @@ if ($result) { print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall; } - + print ''; $param="&type=$type&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email"; @@ -236,7 +235,7 @@ if ($result) { print_liste_field_titre($langs->trans("EMail"),"index.php","p.email", $begin, $param, '', $sortfield,$sortorder); } - print_liste_field_titre($langs->trans("DateModification"),"index.php","p.tms", $begin, $param, 'align="center"', $sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateModificationShort"),"index.php","p.tms", $begin, $param, 'align="center"', $sortfield,$sortorder); print_liste_field_titre($langs->trans("ContactVisibility"),"index.php","p.priv", $begin, $param, 'align="center"', $sortfield,$sortorder); print ''; print "\n"; @@ -269,7 +268,7 @@ if ($result) print ''; } print ''; - print ''; @@ -287,36 +286,36 @@ if ($result) $var=!$var; print ""; - + // Name print ''; - + // Firstname - print ''; - + print ''; + // Company print ''; - + // Phone print ''; - + if ($_GET["view"] == 'phone') { print ''; @@ -330,7 +329,7 @@ if ($result) // Date print ''; - + // Private/Public print ''; @@ -343,9 +342,9 @@ if ($result) print "\n"; $i++; } - - if ($num > $limit) print_barre_liste('' ,$page, "index.php", '&begin='.$begin.'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords, ''); - + + if ($num > $limit) print_barre_liste('' ,$page, "index.php", '&begin='.$begin.'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords, ''); + print "
 
 '; + print ''; $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate")); $form->select_array('search_priv',$selectarray,$search_priv,1); print '
'; $contactstatic->name=$obj->name; $contactstatic->firstname=''; $contactstatic->id=$obj->cidp; - print $contactstatic->getNomUrl(1); + print $contactstatic->getNomUrl(1,'',20); print ''.$obj->firstname.''.dolibarr_trunc($obj->firstname,20).''; if ($obj->socid) { print ''; - print img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,24).''; + print img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,20).''; } else - { + { print ' '; } print ''; print dol_print_phone($obj->phone,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL'); print ''.dol_print_phone($obj->phone_mobile,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL').''.dolibarr_print_date($obj->tms,"day").''.$contactstatic->LibPubPriv($obj->priv).'
"; print '
'; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 37015367018..a083022cad0 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -172,6 +172,7 @@ DateStart=Date start DateEnd=Date end DateCreation=Creation date DateModification=Modification date +DateModificationShort=Modif. date DateLastModification=Last modification date DateValidation=Validation date DateClosing=Closing date diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index b75949112b8..d10e6c671a9 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -171,6 +171,7 @@ DateStart=Date début DateEnd=Date fin DateCreation=Date création DateModification=Date modification +DateModificationShort=Date modif. DateLastModification=Date dernière modification DateValidation=Date validation DateClosing=Date clôture