From 6b18455ec28f16673de8ce7db6b65945072203d3 Mon Sep 17 00:00:00 2001 From: John BOTELLA <68917336+thersane-john@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:03:09 +0100 Subject: [PATCH 1/2] Fix setup color --- htdocs/core/class/html.formsetup.class.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php index f8e86ed503f..21d026aecb5 100644 --- a/htdocs/core/class/html.formsetup.class.php +++ b/htdocs/core/class/html.formsetup.class.php @@ -1317,12 +1317,21 @@ class FormSetupItem public function generateOutputFieldColor() { global $langs; + $out = ''; $this->fieldAttr['disabled'] = null; $color = colorArrayToHex(colorStringToArray($this->fieldValue, array()), ''); - if ($color) { - return ''; + $useDefaultColor = false; + if (!$color && !empty($this->defaultFieldValue)) { + $color = $this->defaultFieldValue; + $useDefaultColor = true; } - return $langs->trans("Default"); + if ($color) { + $out.= ''; + } + + if ($useDefaultColor) $out.= ' '.$langs->trans("Default"); + + return $out; } /** * generateInputFieldColor From 9477b68e0d781d62bb177720d88715c104b7c613 Mon Sep 17 00:00:00 2001 From: John BOTELLA <68917336+thersane-john@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:15:29 +0100 Subject: [PATCH 2/2] add color ref --- htdocs/core/class/html.formsetup.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php index 21d026aecb5..efc97ad63f2 100644 --- a/htdocs/core/class/html.formsetup.class.php +++ b/htdocs/core/class/html.formsetup.class.php @@ -1329,7 +1329,11 @@ class FormSetupItem $out.= ''; } - if ($useDefaultColor) $out.= ' '.$langs->trans("Default"); + if ($useDefaultColor) { + $out.= ' '.$langs->trans("Default"); + } else { + $out.= ' #'.$color; + } return $out; }