Work on theme
@@ -2810,9 +2810,10 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
|
|||||||
* @param string $picto Icon to use before title (should be a 32x32 transparent png file)
|
* @param string $picto Icon to use before title (should be a 32x32 transparent png file)
|
||||||
* @param int $pictoisfullpath 1=Icon name is a full absolute url of image
|
* @param int $pictoisfullpath 1=Icon name is a full absolute url of image
|
||||||
* @param string $morehtml More html to show
|
* @param string $morehtml More html to show
|
||||||
|
* @param string $morecss More css to the table
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='')
|
function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='')
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
|
|
||||||
@@ -2830,7 +2831,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
|
|||||||
|
|
||||||
print "\n";
|
print "\n";
|
||||||
print "<!-- Begin title '".$titre."' -->\n";
|
print "<!-- Begin title '".$titre."' -->\n";
|
||||||
print '<table width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 6px;"><tr>';
|
print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
|
||||||
|
|
||||||
// Left
|
// Left
|
||||||
if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, '', $pictoisfullpath).'</td>';
|
if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, '', $pictoisfullpath).'</td>';
|
||||||
|
|||||||
@@ -315,13 +315,13 @@ else
|
|||||||
$titlefield=$langs->trans("SellingPrice");
|
$titlefield=$langs->trans("SellingPrice");
|
||||||
if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
|
if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
|
||||||
{
|
{
|
||||||
$titlefields=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
|
$titlefield=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
|
||||||
}
|
}
|
||||||
print_liste_field_titre($titlefields, $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
|
print_liste_field_titre($titlefield, $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
|
||||||
}
|
}
|
||||||
if ($user->rights->fournisseur->lire) print '<td class="liste_titre" align="right">'.$langs->trans("BuyingPriceMinShort").'</td>';
|
if ($user->rights->fournisseur->lire) print_liste_field_titre($langs->trans("BuyingPriceMinShort"), '', '', '', '', 'align="right"');
|
||||||
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("DesiredStock").'</td>';
|
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("DesiredStock"), '', '', '', '', 'align="right"');
|
||||||
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("PhysicalStock").'</td>';
|
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("PhysicalStock"), '', '', '', '', 'align="right"');
|
||||||
print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
|
print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
|
||||||
print_liste_field_titre($langs->trans("Buy"), $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder);
|
print_liste_field_titre($langs->trans("Buy"), $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder);
|
||||||
print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
|
print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
|
||||||
@@ -553,7 +553,7 @@ else
|
|||||||
$param.=($fourn_id?"&fourn_id=".$fourn_id:"");
|
$param.=($fourn_id?"&fourn_id=".$fourn_id:"");
|
||||||
$param.=($search_categ?"&search_categ=".$search_categ:"");
|
$param.=($search_categ?"&search_categ=".$search_categ:"");
|
||||||
$param.=isset($type)?"&type=".$type:"";
|
$param.=isset($type)?"&type=".$type:"";
|
||||||
print_barre_liste('', $page, "list.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords);
|
print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', '', '', 'paginationatbottom');
|
||||||
|
|
||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 177 B |
|
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 205 B |
|
Before Width: | Height: | Size: 232 B After Width: | Height: | Size: 179 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 206 B After Width: | Height: | Size: 237 B |
@@ -2187,6 +2187,9 @@ div.pagination li.pagination .active {
|
|||||||
div.pagination li.paginationafterarrows {
|
div.pagination li.paginationafterarrows {
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
|
.paginationatbottom {
|
||||||
|
margin-top: 9px;
|
||||||
|
}
|
||||||
|
|
||||||
/* Prepare to remove class pair - impair
|
/* Prepare to remove class pair - impair
|
||||||
.noborder > tbody > tr:nth-child(even) td {
|
.noborder > tbody > tr:nth-child(even) td {
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 177 B |
|
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 205 B |
|
Before Width: | Height: | Size: 232 B After Width: | Height: | Size: 179 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 192 B |