Look and feel v13

This commit is contained in:
Laurent Destailleur 2020-06-22 04:10:13 +02:00
parent 0a22773eab
commit d816d45331
4 changed files with 39 additions and 19 deletions

View File

@ -1211,23 +1211,15 @@ while ($i < min($num, $limit))
$s = '';
if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
{
$companystatic->name = $langs->trans("Customer");
$companystatic->name_alias = '';
$s .= $companystatic->getNomUrl(0, 'customer', 0, 1);
$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
}
if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
{
if ($s) $s .= ", ";
$companystatic->name = $langs->trans("Prospect");
$companystatic->name_alias = '';
$s .= $companystatic->getNomUrl(0, 'prospect', 0, 1);
$s .= '<a class="customer-back" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
}
if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
{
if ($s) $s .= ", ";
$companystatic->name = $langs->trans("Supplier");
$companystatic->name_alias = '';
$s .= $companystatic->getNomUrl(0, 'supplier', 0, 1);
$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
}
print $s;
print '</td>';

View File

@ -4502,7 +4502,7 @@ td.cal_other_month {
/* ============================================================================== */
/* CSS for treeview */
.treeview ul { background-color: transparent !important; margin-top: 4px; padding-top: 4px !important; }
.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 4px !important; }
.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 26px; }
.treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
@ -5449,7 +5449,8 @@ span.noborderoncategories a, li.noborderoncategories a {
vertical-align: top;
}
span.noborderoncategories {
padding: 3px 5px 0px 5px;
padding: 4px 5px 0px 5px;
display: inline-block;
}
.categtextwhite, .treeview .categtextwhite.hover {
color: #fff !important;

View File

@ -227,20 +227,31 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
<?php } ?>
}
.customer-back {
background-color: #99a17d !important;
color: #FFF !important;
padding: 2px;
margin: 2px;
border-radius: 3px;
}
.vendor-back {
background-color: #599caf !important;
color: #FFF !important;
padding: 2px;
margin: 2px;
border-radius: 3px;
}
.bg-infobox-project{
<?php echo $prefix; ?>color: #6c6aa8 !important;
}
.bg-infobox-action{
<?php echo $prefix; ?>color: #a47080 !important;
}
.bg-infobox-propal,
.bg-infobox-facture,
.bg-infobox-commande{
.bg-infobox-propal, .bg-infobox-facture, .bg-infobox-commande {
<?php echo $prefix; ?>color: #99a17d !important;
}
.bg-infobox-supplier_proposal,
.bg-infobox-invoice_supplier,
.bg-infobox-order_supplier{
.bg-infobox-supplier_proposal, .bg-infobox-invoice_supplier, .bg-infobox-order_supplier {
<?php echo $prefix; ?>color: #599caf !important;
}
.bg-infobox-contrat, .bg-infobox-ticket{

View File

@ -19,6 +19,22 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
?>
.customer-back {
background-color: #99a17d !important;
color: #FFF !important;
padding: 2px;
margin: 2px;
border-radius: 3px;
}
.vendor-back {
background-color: #599caf !important;
color: #FFF !important;
padding: 2px;
margin: 2px;
border-radius: 3px;
}
.bg-infobox-project{
<?php echo $prefix; ?>color: #6c6aa8 !important;
}