diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php index 02033b27bff..f3969793ef0 100644 --- a/htdocs/categories/traduction.php +++ b/htdocs/categories/traduction.php @@ -158,10 +158,23 @@ print ''; // Reference print ''; -print ''; print ''; + +// Description +print ''; + print '
'.$langs->trans("Ref").''; -print $object->label; +print ''; +$ways = $object->print_all_ways(); +print $langs->trans("Ref").''; +print ''.$langs->trans("Root").' >> '; +foreach ($ways as $way) +{ + print $way."
\n"; +} print '
'; +print $langs->trans("Description").''; +print dol_htmlentitiesbr($object->description); +print '
'; if ($action == 'edit') diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index d6f1521e49d..1727db5f227 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -598,7 +598,11 @@ class FormOther include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $color = colorArrayToHex(colorStringToArray($color,array()),''); - if ($color) print ''; + $textcolor='000'; + $tmpcolorweight=0; + foreach(colorStringToArray($color,array()) as $x) $tmpcolorweight+=$x; + if ($tmpcolorweight < 400) $textcolor='FFF'; + if ($color) print ''; else print $textifnotdefined; }