lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor esthetical change

Browse Source
This commit is contained in:
Laurent Destailleur 2009-01-31 00:28:30 +00:00
parent 7408bb6f8e
commit f2b6dcfe16
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
htdocs/contact/index.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com> * Copyright (C) 2003 Eric Seigne <erics@rycks.com>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -61,12 +61,12 @@ $langs->load("companies");
$titre=$langs->trans("ListOfContacts"); $titre=$langs->trans("ListOfContacts");
if ($type == "c") if ($type == "c")
{ {
$titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')'; $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')';
$urlfiche="fiche.php"; $urlfiche="fiche.php";
} }
if ($type == "p") if ($type == "p")
{ {
$titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyProspects").')'; $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyProspects").')';
$urlfiche="prospect/fiche.php"; $urlfiche="prospect/fiche.php";
} }
if ($type == "f") { if ($type == "f") {
@ -96,10 +96,9 @@ if ($search_priv < 0) $search_priv='';
/* /*
* Affichage liste * View
*
*/ */
llxHeader(); llxHeader();
$form=new Form($db); $form=new Form($db);
@ -174,13 +173,13 @@ if ($socid)
{ {
$sql .= " AND s.rowid = ".$socid; $sql .= " AND s.rowid = ".$socid;
} }
// Count total nb of records // Count total nb of records
$nbtotalofrecords = 0; $nbtotalofrecords = 0;
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{ {
$result = $db->query($sql); $result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result); $nbtotalofrecords = $db->num_rows($result);
} }
// Add order and limit // Add order and limit
if($_GET["view"] == "recent") if($_GET["view"] == "recent")
{ {
@ -198,13 +197,13 @@ $result = $db->query($sql);
if ($result) if ($result)
{ {
$contactstatic=new Contact($db); $contactstatic=new Contact($db);
$begin=$_GET["begin"]; $begin=$_GET["begin"];
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
print_barre_liste($titre ,$page, "index.php", '&amp;begin='.$begin.'&amp;view='.$_GET["view"].'&amp;userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords); print_barre_liste($titre ,$page, "index.php", '&amp;begin='.$begin.'&amp;view='.$_GET["view"].'&amp;userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords);
print '<form method="post" action="index.php">'; print '<form method="post" action="index.php">';
print '<input type="hidden" name="view" value="'.$view.'">'; print '<input type="hidden" name="view" value="'.$view.'">';
@ -215,7 +214,7 @@ if ($result)
{ {
print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall; print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall;
} }
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
$param="&type=$type&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email"; $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("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_liste_field_titre($langs->trans("ContactVisibility"),"index.php","p.priv", $begin, $param, 'align="center"', $sortfield,$sortorder);
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
@ -269,7 +268,7 @@ if ($result)
print '</td>'; print '</td>';
} }
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre">'; print '<td class="liste_titre" align="center">';
$selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate")); $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate"));
$form->select_array('search_priv',$selectarray,$search_priv,1); $form->select_array('search_priv',$selectarray,$search_priv,1);
print '</td>'; print '</td>';
@ -287,36 +286,36 @@ if ($result)
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
// Name // Name
print '<td valign="center">'; print '<td valign="center">';
$contactstatic->name=$obj->name; $contactstatic->name=$obj->name;
$contactstatic->firstname=''; $contactstatic->firstname='';
$contactstatic->id=$obj->cidp; $contactstatic->id=$obj->cidp;
print $contactstatic->getNomUrl(1); print $contactstatic->getNomUrl(1,'',20);
print '</td>'; print '</td>';
// Firstname // Firstname
print '<td>'.$obj->firstname.'</td>'; print '<td>'.dolibarr_trunc($obj->firstname,20).'</td>';
// Company // Company
print '<td>'; print '<td>';
if ($obj->socid) if ($obj->socid)
{ {
print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'; print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">';
print img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,24).'</a>'; print img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,20).'</a>';
} }
else else
{ {
print '&nbsp;'; print '&nbsp;';
} }
print '</td>'; print '</td>';
// Phone // Phone
print '<td>'; print '<td>';
print dol_print_phone($obj->phone,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL'); print dol_print_phone($obj->phone,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL');
print '</td>'; print '</td>';
if ($_GET["view"] == 'phone') if ($_GET["view"] == 'phone')
{ {
print '<td>'.dol_print_phone($obj->phone_mobile,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>'; print '<td>'.dol_print_phone($obj->phone_mobile,$obj->pays_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
@ -330,7 +329,7 @@ if ($result)
// Date // Date
print '<td align="center">'.dolibarr_print_date($obj->tms,"day").'</td>'; print '<td align="center">'.dolibarr_print_date($obj->tms,"day").'</td>';
// Private/Public // Private/Public
print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>'; print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>';
@ -343,9 +342,9 @@ if ($result)
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }
if ($num > $limit) print_barre_liste('' ,$page, "index.php", '&amp;begin='.$begin.'&amp;view='.$_GET["view"].'&amp;userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords, ''); if ($num > $limit) print_barre_liste('' ,$page, "index.php", '&amp;begin='.$begin.'&amp;view='.$_GET["view"].'&amp;userid='.$_GET["userid"], $sortfield, $sortorder,'',$num,$nbtotalofrecords, '');
print "</table>"; print "</table>";
print '</form>'; print '</form>';

1
htdocs/langs/en_US/main.lang
View File

@ -172,6 +172,7 @@ DateStart=Date start
DateEnd=Date end DateEnd=Date end
DateCreation=Creation date DateCreation=Creation date
DateModification=Modification date DateModification=Modification date
DateModificationShort=Modif. date
DateLastModification=Last modification date DateLastModification=Last modification date
DateValidation=Validation date DateValidation=Validation date
DateClosing=Closing date DateClosing=Closing date

1
htdocs/langs/fr_FR/main.lang
View File

@ -171,6 +171,7 @@ DateStart=Date début
DateEnd=Date fin DateEnd=Date fin
DateCreation=Date création DateCreation=Date création
DateModification=Date modification DateModification=Date modification
DateModificationShort=Date modif.
DateLastModification=Date dernière modification DateLastModification=Date dernière modification
DateValidation=Date validation DateValidation=Date validation
DateClosing=Date clôture DateClosing=Date clôture