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

Look and feel v13

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-10 16:37:42 +02:00
parent bcab13c395
commit f06737097f
4 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contrat/class/contrat.class.php
View File

@ -1968,7 +1968,7 @@ class Contrat extends CommonObject
$label = ''; $label = '';
if ($user->rights->contrat->lire) { if ($user->rights->contrat->lire) {
$label = '<u>'.$langs->trans("ShowContract").'</u>'; $label = img_picto('', $this->picto).' <u>'.$langs->trans("Contract").'</u>';
$label .= '<br><b>'.$langs->trans('Ref').':</b> '.($this->ref ? $this->ref : $this->id); $label .= '<br><b>'.$langs->trans('Ref').':</b> '.($this->ref ? $this->ref : $this->id);
$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client); $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier; $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;

4
htdocs/product/class/product.class.php
View File

@ -4280,9 +4280,9 @@ class Product extends CommonObject
if ($maxlength) { $newref = dol_trunc($newref, $maxlength, 'middle'); if ($maxlength) { $newref = dol_trunc($newref, $maxlength, 'middle');
} }
if ($this->type == Product::TYPE_PRODUCT) { $label = '<u>'.$langs->trans("Product").'</u>'; if ($this->type == Product::TYPE_PRODUCT) { $label = img_picto('', 'product').' <u>'.$langs->trans("Product").'</u>';
} }
if ($this->type == Product::TYPE_SERVICE) { $label = '<u>'.$langs->trans("Service").'</u>'; if ($this->type == Product::TYPE_SERVICE) { $label = img_picto('', 'service').' <u>'.$langs->trans("Service").'</u>';
} }
if (!empty($this->ref)) { if (!empty($this->ref)) {
$label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref; $label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;

18
htdocs/societe/class/societe.class.php
View File

@ -2360,42 +2360,42 @@ class Societe extends CommonObject
if ($option == 'customer' || $option == 'compta' || $option == 'category') if ($option == 'customer' || $option == 'compta' || $option == 'category')
{ {
$label .= '<u>'.$langs->trans("Customer").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("Customer").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id; $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) } elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
{ {
$label .= '<u>'.$langs->trans("Prospect").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("Prospect").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id; $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
} elseif ($option == 'supplier' || $option == 'category_supplier') } elseif ($option == 'supplier' || $option == 'category_supplier')
{ {
$label .= '<u>'.$langs->trans("Supplier").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("Supplier").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id; $linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
} elseif ($option == 'agenda') } elseif ($option == 'agenda')
{ {
$label .= '<u>'.$langs->trans("ThirdParty").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id; $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
} elseif ($option == 'project') } elseif ($option == 'project')
{ {
$label .= '<u>'.$langs->trans("ThirdParty").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id; $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
} elseif ($option == 'margin') } elseif ($option == 'margin')
{ {
$label .= '<u>'.$langs->trans("ThirdParty").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1'; $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
} elseif ($option == 'contact') } elseif ($option == 'contact')
{ {
$label .= '<u>'.$langs->trans("ThirdParty").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id; $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
} elseif ($option == 'ban') } elseif ($option == 'ban')
{ {
$label .= '<u>'.$langs->trans("ThirdParty").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id; $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
} }
// By default // By default
if (empty($linkstart)) if (empty($linkstart))
{ {
$label .= '<u>'.$langs->trans("ThirdParty").'</u>'; $label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id; $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
} }

15
htdocs/theme/eldy/global.inc.php
View File

@ -118,7 +118,7 @@ body {
th a { font-weight: <?php echo ($useboldtitle ? 'bold' : 'normal'); ?> !important; } th a { font-weight: <?php echo ($useboldtitle ? 'bold' : 'normal'); ?> !important; }
a.tab { font-weight: 500 !important; } a.tab { font-weight: 500 !important; }
a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; color: var(--colortextlink); text-decoration: none; } a:link, a:visited, a:hover, a:active { color: var(--colortextlink); text-decoration: none; }
a:hover { text-decoration: underline; color: var(--colortextlink); } a:hover { text-decoration: underline; color: var(--colortextlink); }
a.commonlink { color: var(--colortextlink) !important; text-decoration: none; } a.commonlink { color: var(--colortextlink) !important; text-decoration: none; }
th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; } th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; }
@ -4176,7 +4176,7 @@ div.ui-tooltip {
div.ui-tooltip.mytooltip { div.ui-tooltip.mytooltip {
border: none !important; border: none !important;
padding: 10px 15px; padding: 10px 15px;
border-radius: 0; border-radius: 4px;
margin: 2px; margin: 2px;
font-stretch: condensed; font-stretch: condensed;
-moz-box-shadow: 0.5px 0.5px 4px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0.5px 0.5px 4px 0px rgba(0, 0, 0, 0.5);
@ -4186,6 +4186,7 @@ div.ui-tooltip.mytooltip {
filter:progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=134, Strength=5); filter:progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=134, Strength=5);
background: var(--tooltipbgcolor) !important; background: var(--tooltipbgcolor) !important;
color : var(--tooltipfontcolor); color : var(--tooltipfontcolor);
line-height: 1.8em;
} }
@ -6269,6 +6270,16 @@ div.tabsElem a.tab {
span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-tooltip.phpdebugbar-tooltip-wide { span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-tooltip.phpdebugbar-tooltip-wide {
width: 250px !important; width: 250px !important;
} }
.phpdebugbar-indicator span.phpdebugbar-tooltip {
opacity: .95 !important;
}
a.phpdebugbar-tab.phpdebugbar-active {
background-image: unset !important;
}
.phpdebugbar-indicator .fa {
font-family: "Font Awesome 5 Free";
font-weight: 600;
}
/* ============================================================================== */ /* ============================================================================== */