forks/baikal
1
0
Fork 0
Code Releases Activity

Adjusted interface text for optional alpha channel

Browse source 
Former-commit-id: d1993f00c1
This commit is contained in:
Tim Bolender 2014-04-24 12:49:37 +02:00
parent cd7302ede0
commit 50c3b6f832
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Core/Frameworks/Baikal/Model/Calendar.php
View file

@ -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.</br>".
"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.</br>".
"This value is optional.",
)
)));

2
Core/Frameworks/Formal/Form.php
View file

@ -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 "<strong>" . $oElement->option("label") . "</strong> is not a valid color with format '#RRGGBBAA' in hexadecimal values.";
return "<strong>" . $oElement->option("label") . "</strong> is not a valid color with format '#RRGGBB' or '#RRGGBBAA' in hexadecimal values.";
}
return TRUE;