diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 2f495e60bf7de3f29177ed8d7f03ea1a99fe272e..d89360631db949513b746927604b1326240a3861 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -195,9 +195,10 @@ if ($resql)
if (! empty($conf->categorie->enabled))
{
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$formother->select_categories(Categorie::TYPE_MEMBER,$search_categ,'search_categ',1);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
if (! empty($moreforfilter))
{
@@ -209,7 +210,7 @@ if ($resql)
print '</div>';
}
- print '<table class="liste">';
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 75102ed9f501975bff74974f2cba563213099016..b2fe0ac404be4baaa6b880d9175952625982954c 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -168,7 +168,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
print load_fiche_titre($langs->trans("MembersTypes"));
- dol_fiche_head('');
+ //dol_fiche_head('');
$sql = "SELECT d.rowid, d.libelle, d.cotisation, d.vote";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
@@ -211,7 +211,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
dol_print_error($db);
}
- dol_fiche_end();
+ //dol_fiche_end();
/*
* Hotbar
diff --git a/htdocs/comm/askpricesupplier/list.php b/htdocs/comm/askpricesupplier/list.php
index 2e78045b3085cf840d44f9975ae86e16b17eb06e..ae7ed58b29c49760a76bd406d317c89a0f9cb2e9 100644
--- a/htdocs/comm/askpricesupplier/list.php
+++ b/htdocs/comm/askpricesupplier/list.php
@@ -242,7 +242,6 @@ if ($result)
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
$i = 0;
- print '<table class="liste" width="100%">';
$moreforfilter='';
@@ -250,25 +249,32 @@ if ($result)
if ($user->rights->societe->client->voir || $socid)
{
$langs->load("commercial");
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
// If the user can view prospects other than his'
if ($user->rights->societe->client->voir || $socid)
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
$moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+ $moreforfilter.='</div>';
}
- if (! empty($moreforfilter))
- {
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="10">';
- print $moreforfilter;
- print '</td></tr>';
- }
-
- print '<tr class="liste_titre">';
+ if (! empty($moreforfilter))
+ {
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
+ print $moreforfilter;
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
+ }
+
+
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
+ print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('AskPriceSupplierDate'),$_SERVER["PHP_SELF"],'p.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php
index fcc1783daf5fc493ce03e51c7bc7f9212bbef90c..1cc0f2fa9682be60e2b860734cdcc9c7edf8b80d 100644
--- a/htdocs/comm/list.php
+++ b/htdocs/comm/list.php
@@ -193,15 +193,18 @@ if ($result)
$moreforfilter='';
if (! empty($conf->categorie->enabled))
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$formother->select_categories(2,$search_categ,'search_categ',1);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
// If the user can view prospects other than his'
if ($user->rights->societe->client->voir || $socid)
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
+ $moreforfilter.='</div>';
}
if ($moreforfilter)
{
@@ -213,7 +216,7 @@ if ($result)
print '</div>';
}
- print '<table class="liste">'."\n";
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index f595ad8aec0d4b2341804a997e065953c1e01775..7d1539ff0f52dd53fe6f60c271a66f867fb5f445 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -265,7 +265,6 @@ if ($result)
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
$i = 0;
- print '<table class="liste" width="100%">';
$moreforfilter='';
@@ -298,12 +297,13 @@ if ($result)
}
if (! empty($moreforfilter))
{
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="10">';
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
print $moreforfilter;
- print '</td></tr>';
+ print '</div>';
}
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
+
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'p.ref_client','',$param,'',$sortfield,$sortorder);
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 670d170de9787ae22b757e2be4c345906bc76433..2282b39420e21664b17a7db66a6d99f7b5f2e8c5 100644
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -359,15 +359,18 @@ if ($resql)
if (! empty($conf->categorie->enabled))
{
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$formother->select_categories(Categorie::TYPE_CUSTOMER,$search_categ,'search_categ',1);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
// If the user can view prospects other than his'
if ($user->rights->societe->client->voir || $socid)
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
+ $moreforfilter.='</div>';
}
if ($moreforfilter)
{
@@ -379,7 +382,7 @@ if ($resql)
print '</div>';
}
- print '<table class="liste">';
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c4ea9cbf83841a50c537ac3bebefee74267cadb4..200f9e66362ab8ea4b0802775b69358ed8ece236 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -301,7 +301,7 @@ if ($resql)
print '</div>';
}
- print '<table class="liste">';
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'c.ref','',$param,'width="25%"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('RefCustomerOrder'),$_SERVER["PHP_SELF"],'c.ref_client','',$param,'',$sortfield,$sortorder);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index b507f5284dde7624536500229437d4e0a128853b..e4993eacb888e71399f6c1fd58081f1d0aa51d20 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -275,7 +275,6 @@ if ($resql)
$i = 0;
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'."\n";
- print '<table class="liste" width="100%">';
// If the user can view prospects other than his'
$moreforfilter='';
@@ -308,12 +307,16 @@ if ($resql)
if ($moreforfilter)
{
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="11">';
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
print $moreforfilter;
- print '</td></tr>';
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
}
+ print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
+
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'f.facnumber','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
index 72276b7706926717f7521a9a4803954c6f84be8a..b78b31d1a02f6136ac027e4c80a1400617cb5275 100644
--- a/htdocs/compta/facture/mergepdftool.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -616,32 +616,38 @@ if ($resql)
}
$i = 0;
- print '<table class="liste" width="100%">';
// If the user can view prospects other than his'
$moreforfilter='';
if ($user->rights->societe->client->voir || $socid)
{
$langs->load("commercial");
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
// If the user can view prospects other than his'
if ($user->rights->societe->client->voir || $socid)
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
$moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+ $moreforfilter.='</div>';
}
- if ($moreforfilter)
+ if (! empty($moreforfilter))
{
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="13">';
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
print $moreforfilter;
- print '</td></tr>';
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
}
- print '<tr class="liste_titre">';
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
+
+ print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center"',$sortfield,$sortorder);
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index d44aef51dcedadcc7fcd63c1ae4e3c5faa588ec4..c322863efc1ac2db0a21682380f069eb520eea48 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -117,7 +117,7 @@ if ($resql)
print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num);
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
- print '<table class="liste" width="100%">';
+ print '<table class="liste">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.number","",$params,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"dp","",$params,'align="center"',$sortfield,$sortorder);
@@ -148,42 +148,52 @@ if ($resql)
print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
print "</td></tr>\n";
- $var=true;
- while ($i < min($num,$limit))
- {
- $objp = $db->fetch_object($resql);
- $var=!$var;
- print "<tr ".$bc[$var].">";
-
- // Num ref cheque
- print '<td width="80">';
- $checkdepositstatic->id=$objp->rowid;
- $checkdepositstatic->ref=($objp->ref?$objp->ref:$objp->rowid);
- $checkdepositstatic->statut=$objp->statut;
- print $checkdepositstatic->getNomUrl(1);
- print '</td>';
-
- // Date
- print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>'; // TODO Use date hour
-
- // Bank
- print '<td>';
- if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
- else print ' ';
- print '</td>';
-
- // Number of cheques
- print '<td align="right">'.$objp->nbcheque.'</td>';
-
- // Amount
- print '<td align="right">'.price($objp->amount).'</td>';
-
- // Statut
- print '<td align="right">';
- print $checkdepositstatic->LibStatut($objp->statut,5);
- print "</td></tr>\n";
- $i++;
- }
+ if ($num > 0)
+ {
+ $var=true;
+ while ($i < min($num,$limit))
+ {
+ $objp = $db->fetch_object($resql);
+ $var=!$var;
+ print "<tr ".$bc[$var].">";
+
+ // Num ref cheque
+ print '<td width="80">';
+ $checkdepositstatic->id=$objp->rowid;
+ $checkdepositstatic->ref=($objp->ref?$objp->ref:$objp->rowid);
+ $checkdepositstatic->statut=$objp->statut;
+ print $checkdepositstatic->getNomUrl(1);
+ print '</td>';
+
+ // Date
+ print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>'; // TODO Use date hour
+
+ // Bank
+ print '<td>';
+ if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
+ else print ' ';
+ print '</td>';
+
+ // Number of cheques
+ print '<td align="right">'.$objp->nbcheque.'</td>';
+
+ // Amount
+ print '<td align="right">'.price($objp->amount).'</td>';
+
+ // Statut
+ print '<td align="right">';
+ print $checkdepositstatic->LibStatut($objp->statut,5);
+ print "</td></tr>\n";
+ $i++;
+ }
+ }
+ else
+ {
+ $var=!$var;
+ print "<tr ".$bc[$var].">";
+ print '<td colspan="6">'.$langs->trans("None")."</td>";
+ print '</tr>';
+ }
print "</table>";
print "</form>\n";
}
@@ -192,6 +202,6 @@ else
dol_print_error($db);
}
-$db->close();
llxFooter();
+$db->close();
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 45c9d0b526b3ba806a86c79d295d1db8658274f4..35d0f838ff957ca74982088d20e1b55cb70841b3 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -906,7 +906,7 @@ class Paiement extends CommonObject
if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$linkend);
if ($withpicto && $withpicto != 2) $result.=' ';
- if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+ if ($withpicto != 2) $result.=$link.($this->ref?$this->ref:$this->id).$linkend;
return $result;
}
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 8231f607ef7a7459760e5c193bcadd444b70e1ce..6e3d31364ce9214376d25997893a91d51e6b45d2 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -305,6 +305,5 @@ else
dol_print_error($db);
}
-$db->close();
-
llxFooter();
+$db->close();
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 649179c10826f5fb692dc2a06979a702e3c8ee18..4082ebbae8086c083013b56032117314c2a4ff18 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -288,9 +288,10 @@ if ($result)
if (! empty($conf->categorie->enabled))
{
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
- $moreforfilter.=$langs->trans('Categories'). ': ';
+ $moreforfilter.='<div class="divsearchfield">';
+ $moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$formother->select_categories(Categorie::TYPE_CONTACT,$search_categ,'search_categ',1);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
if ($moreforfilter)
{
@@ -299,7 +300,7 @@ if ($result)
print '</div>';
}
- print '<table class="liste">';
+ print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
// Ligne des titres
print '<tr class="liste_titre">';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 97d20e2acb18a4d3ca360c95f5613e09c9976a16..a4f719cf7f58b49fd9a2054fc949de29bd626eac 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -136,26 +136,29 @@ if ($resql)
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
- print '<table class="liste" width="100%">';
// If the user can view prospects other than his'
$moreforfilter='';
if ($user->rights->societe->client->voir || $socid)
{
$langs->load("commercial");
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
- if ($moreforfilter)
+ if (! empty($moreforfilter))
{
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="9">';
- print $moreforfilter;
- print '</td></tr>';
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
+ print $moreforfilter;
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
}
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
print '<tr class="liste_titre">';
$param='&search_contract='.$search_contract;
diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php
index 5693031c630ce365492d93c8325774cd51c22855..8fb3385091955433e3cbf7b70ebf2b62ff05f7f6 100644
--- a/htdocs/fourn/list.php
+++ b/htdocs/fourn/list.php
@@ -195,9 +195,10 @@ if ($resql)
if (! empty($conf->categorie->enabled))
{
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_SUPPLIER,$search_categ,'search_categ',1);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
if ($moreforfilter)
{
@@ -209,8 +210,8 @@ if ($resql)
print '</div>';
}
- print '<table class="liste">';
-
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
+
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'valign="middle"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,'valign="middle"',$sortfield,$sortorder);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 68e6143c48c6f26a8d39de814c72e86d5773b7a6..d973a3d41ef86373e984aedb665f19daed306603 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -281,8 +281,6 @@ else
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="type" value="'.$type.'">';
- print '<table class="liste" width="100%">';
-
// Filter on categories
$moreforfilter='';
$colspan=6;
@@ -294,19 +292,23 @@ else
if (! empty($conf->categorie->enabled))
{
- $moreforfilter.=$langs->trans('Categories'). ': ';
+ $moreforfilter.='<div class="divsearchfield">';
+ $moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_PRODUCT,$search_categ,'search_categ',1);
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
if ($moreforfilter)
{
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="'.$colspan.'">';
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
print $moreforfilter;
- print '</td></tr>';
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
}
// Lignes des titres
+ print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 8bd2096af69aa1b81f3f694de45da85f37e89506..cee05f69340459b8f0e54ae10f1705898e73e419 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -215,27 +215,35 @@ if ($resql)
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="type" value="'.$type.'">';
- print '<table class="liste" width="100%">';
-
// Filter on categories
$moreforfilter='';
if (! empty($conf->categorie->enabled))
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_PRODUCT,$search_categ,'search_categ');
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
+
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock?' checked':'').'>';
- if ($moreforfilter)
- {
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="9">';
- print $moreforfilter;
- print '</td></tr>';
- }
+ $moreforfilter.='</div>';
+
+ if (! empty($moreforfilter))
+ {
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
+ print $moreforfilter;
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
+ }
+
$param="&tosell=$tosell&tobuy=$tobuy".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref";
-
+
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
+
// Lignes des titres
print "<tr class=\"liste_titre\">";
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 86410df8a00d523ede3eb41913aa7507a308b4e6..d7f5905fbd31085086f17366aaa32c8582d58c88 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -227,27 +227,32 @@ if ($resql)
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="type" value="'.$type.'">';
- print '<table class="liste" width="100%">';
-
// Filter on categories
$moreforfilter='';
if (! empty($conf->categorie->enabled))
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_PRODUCT,$search_categ,'search_categ');
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
//$moreforfilter.=$langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock?' checked':'').'>';
- if ($moreforfilter)
- {
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="11">';
- print $moreforfilter;
- print '</td></tr>';
- }
+
+ if (! empty($moreforfilter))
+ {
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
+ print $moreforfilter;
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
+ }
+
$param="&tosell=$tosell&tobuy=$tobuy".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref&batch=$batch&eatby=$eatby&sellby=$sellby";
+ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
+
// Lignes des titres
print "<tr class=\"liste_titre\">";
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 8e98bf9e93f326fa5a9e98da9c605299a14daa20..16fac9bb1bd7fc23d5014cc216ab9544b350cc1c 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -274,15 +274,18 @@ if ($resql)
if (! empty($moreforfilter))
{
print '<div class="liste_titre liste_titre_bydiv centpercent">';
+ //print '<tr class="liste_titre">';
+ //print '<td class="liste_titre" colspan="'.$colspan.'">';
print $moreforfilter;
$parameters=array();
$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print '</div>';
- }
+ //print '</td></tr>';
+ }
- print '<table class="liste">';
-
+ print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
+
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index 082fbdd8d7b26188be048ff10a448b03cd8d386b..39484f05014d200843798fe7d7fef222d2ae8010 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -141,7 +141,7 @@ if (! empty($moreforfilter))
print '</div>';
}
-print '<table class="liste">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Project").'</td>';
print '<td>'.$langs->trans("ProjectStatus").'</td>';
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index d31b10ff5ef9632c32431021e169be07e59adc9f..2801ebb8855dff6914aab1df857d4069c7f7018a 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -146,9 +146,7 @@ $nav.='</form>';
print_barre_liste('Title of my list', 3, $_SERVER["PHP_SELF"], '', '', '', 'Text in middle', 20, 5000, '', 0, $nav);
-?>
-<table class="liste noborder tagtable centpercent" id="tablelines3">
-<?php
+
$moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('This is a select list for a filter A'). ': ';
$cate_arbo = array('field1'=>'value1a into the select list A','field2'=>'value2a');
@@ -175,11 +173,15 @@ $moreforfilter.='</div>';
if (! empty($moreforfilter))
{
- print '<tr class="liste_titre">';
- print '<td class="liste_titre" colspan="10">';
+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
print $moreforfilter;
- print '</td></tr>';
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ print '</div>';
}
+
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">';
?>
<tr class="liste_titre">
<?php print getTitleFieldOfList($langs->trans('title1'),0,$_SERVER["PHP_SELF"],'aaa','','','align="left"',$sortfield,$sortorder); ?>
@@ -188,7 +190,9 @@ if (! empty($moreforfilter))
</tr>
<tr class="pair"><td><?php echo $productspecimen->getNomUrl(1); ?></td><td align="right">b1</td><td class="tdlineupdown" align="left">c1</td></tr>
<tr class="impair"><td>a2</td><td align="right">b2</td><td class="tdlineupdown" align="left">c2</td></tr>
-</table>
+<?php
+print '</table>';
+?>
<br>
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index a5792642a64f29327090c055cf9f54d4cdafd9e2..5e73552e231eeb2bcec8b104e615a232fbcfd306 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -321,15 +321,18 @@ if ($resql)
$moreforfilter='';
if (! empty($conf->categorie->enabled))
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ': ';
$moreforfilter.=$htmlother->select_categories(Categories::TYPE_CUSTOMER,$search_categ,'search_categ');
- $moreforfilter.=' ';
+ $moreforfilter.='</div>';
}
// If the user can view prospects other than his'
if ($user->rights->societe->client->voir || $socid)
{
+ $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
$moreforfilter.=$htmlother->select_salesrepresentatives($search_sale,'search_sale',$user);
+ $moreforfilter.='</div>';
}
if ($moreforfilter)
{
@@ -349,8 +352,8 @@ if ($resql)
print '</div>';
}
- print '<table class="liste">';
-
+ print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
+
// Lines of titles
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b6987ed42cc15841767a51da7252ff62db7f4806..9f5376947da406670c45efed26dff85cbc812b23 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -452,8 +452,10 @@ textarea.centpercent {
div.divsearchfield {
float: <?php print $left; ?>;
margin-<?php print $right; ?>: 12px;
- margin-top: 1px;
- margin-bottom: 2px;
+ margin-<?php print $left; ?>: 2px;
+ margin-top: 3px;
+ margin-bottom: 3px;
+ padding-left: 2px;
}
div.confirmmessage {
padding-top: 6px;
@@ -1934,7 +1936,7 @@ td.border, div.tagtable div div.border {
/* Main boxes */
-table.noborder, table.formdoc, div.noborder {
+table.liste, table.noborder, table.formdoc, div.noborder {
width: 100%;
border-collapse: separate !important;
@@ -1962,25 +1964,28 @@ table.noborder, table.formdoc, div.noborder {
-webkit-box-shadow: 2px 2px 4px #CCC;
box-shadow: 2px 2px 4px #CCC;
- -moz-border-radius: 0.2em;
+/* -moz-border-radius: 0.2em;
-webkit-border-radius: 0.2em;
- border-radius: 0.2em;
+ border-radius: 0.2em;*/
}
-table.noborder tr, div.noborder form {
+table.liste tr, table.noborder tr, div.noborder form {
border-top-color: #FEFEFE;
border-right-width: 1px;
- border-right-color: #BBBBBB;
+ border-right-color: #BBB;
border-right-style: solid;
border-left-width: 1px;
- border-left-color: #BBBBBB;
+ border-left-color: #BBB;
border-left-style: solid;
min-height: 20px;
}
-table.noborder th, table.noborder td, div.noborder form, div.noborder form div {
+table.liste th, table.noborder th {
+ padding: 10px 2px 10px 3px; /* t r b l */
+}
+table.liste td, table.noborder td, div.noborder form, div.noborder form div {
padding: 5px 2px 5px 3px; /* t r b l */
}
@@ -2008,42 +2013,12 @@ td.borderright {
}
-/* For lists */
-
-table.liste {
- width: 100%;
-
- border-collapse: collapse;
-/* border-top-color: #FEFEFE;
- border-top-width: 1px;
- border-top-color: #CCC;
- border-top-style: solid;
-*/
-
- border-right-width: 1px;
- border-right-color: #CCC;
- border-right-style: solid;
-
-/*
- border-bottom-width: 1px;
- border-bottom-color: #BBBBBB;
- border-bottom-style: solid;
-*/
- border-left-width: 1px;
- border-left-color: #CCC;
- border-left-style: solid;
-
- margin-bottom: 2px;
- margin-top: 0px;
-
- -moz-box-shadow: 0px 3px 4px #CCC;
- -webkit-box-shadow: 0px 3px 4px #CC;
- box-shadow: 0px 3px 4px #CCC;
-}
-table.liste td {
- padding-right: 2px;
+/* For table with no filter before */
+table.listwithfilterbefore {
+ border-top: none !important;
}
+
.tagtable, .table-border { display: table; }
.tagtr, .table-border-row { display: table-row; }
.tagtd, .table-border-col, .table-key-border-col, .table-val-border-col { display: table-cell; }
@@ -2285,27 +2260,28 @@ div.liste_titre {
div.liste_titre {
min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height does not work either for div */
- padding-left: 3px;
padding-top: 2px;
padding-bottom: 2px;
border-right-width: 1px;
- border-right-color: #CCC;
+ border-right-color: #BBB;
border-right-style: solid;
border-left-width: 1px;
- border-left-color: #CCC;
+ border-left-color: #BBB;
border-left-style: solid;
border-top-width: 1px;
- border-top-color: #CCC;
+ border-top-color: #BBB;
border-top-style: solid;
}
div.liste_titre_bydiv {
box-shadow: none;
border-collapse: collapse;
display: table;
- padding: 2px 2px 2px 0;
+ padding: 2px 0px 2px 0;
+ box-shadow: 2px 2px 4px #CCC;
+ width: calc(100% - 1px); /* 1px more, i don't know why */
}
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
{