diff --git a/Core/Frameworks/Baikal/Model/Calendar.php b/Core/Frameworks/Baikal/Model/Calendar.php index 4b16898..c3e261d 100644 --- a/Core/Frameworks/Baikal/Model/Calendar.php +++ b/Core/Frameworks/Baikal/Model/Calendar.php @@ -169,7 +169,8 @@ class Calendar extends \Flake\Core\Model\Db { "popover" => array( "title" => "Calendar color", "content" => "This is the color that will be displayed in your CalDAV client.
". - "Must be supplied in format '#RRGGBBAA' with hexadecimal values. This value is optional.", + "Must be supplied in format '#RRGGBBAA' (alpha channel optional) with hexadecimal values.
". + "This value is optional.", ) ))); diff --git a/Core/Frameworks/Formal/Form.php b/Core/Frameworks/Formal/Form.php index afba56c..5283b2b 100644 --- a/Core/Frameworks/Formal/Form.php +++ b/Core/Frameworks/Formal/Form.php @@ -317,7 +317,7 @@ class Form { public function validateColor($sValue, \Formal\Form\Morphology $oMorpho, \Formal\Element $oElement) { if(!empty($sValue) && !preg_match("/^#[a-fA-F0-9]{6}([a-fA-F0-9]{2})?$/", $sValue)) { - return "" . $oElement->option("label") . " is not a valid color with format '#RRGGBBAA' in hexadecimal values."; + return "" . $oElement->option("label") . " is not a valid color with format '#RRGGBB' or '#RRGGBBAA' in hexadecimal values."; } return TRUE;