forks/baikal
1
0
Fork 0
Code Releases Activity

Merge pull request #232 from itiboi/calendar-color

Browse source 
Added possibility to edit calendar color

Former-commit-id: a1c15f450b
This commit is contained in:
Net Gusto 2014-10-22 11:26:29 +02:00
commit 77489588b7
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,6 +162,18 @@ class Calendar extends \Flake\Core\Model\Db {
)
)));
$oMorpho->add(new \Formal\Element\Text(array(
"prop" => "calendarcolor",
"label" => "Calendar color",
"validation" => "color",
"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' (alpha channel optional) with hexadecimal values.</br>".
"This value is optional.",
)
)));
$oMorpho->add(new \Formal\Element\Text(array(
"prop" => "description",
"label" => "Description"

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

@ -314,6 +314,14 @@ class Form {
return TRUE;
}
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 '#RRGGBB' or '#RRGGBBAA' in hexadecimal values.";
}
return TRUE;
}
public function postValue($sPropName) {
$aData = \Flake\Util\Tools::POST("data");