diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2011-10-21 21:22:06 +0100 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2011-10-21 21:22:06 +0100 |
| commit | ba3d139de856de2e2a7c8f92f0dbf7bba3905bbd (patch) | |
| tree | ecc4c309d2da5283b79f398e996366926fa3e9fe /apps/calendar/lib/calendar.php | |
| parent | 9bde002c95e35c84c2c53ddbf5f3d196cff5812d (diff) | |
| parent | c420001f2b28a619fe844d7366ae3984b38021e9 (diff) | |
| download | nextcloud-server-ba3d139de856de2e2a7c8f92f0dbf7bba3905bbd.tar.gz nextcloud-server-ba3d139de856de2e2a7c8f92f0dbf7bba3905bbd.zip | |
Merged from master and fixed issue with opening multiple editors
Diffstat (limited to 'apps/calendar/lib/calendar.php')
| -rw-r--r-- | apps/calendar/lib/calendar.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php index 959cb14bf8f..c19c0e73c08 100644 --- a/apps/calendar/lib/calendar.php +++ b/apps/calendar/lib/calendar.php @@ -228,4 +228,16 @@ class OC_Calendar_Calendar{ list($prefix,$userid) = Sabre_DAV_URLUtil::splitPath($principaluri); return $userid; } + public static function getCalendarColorOptions(){ + return array( + 'ff0000', // "Red" + '00ff00', // "Green" + 'ffff00', // "Yellow" + '808000', // "Olive" + 'ffa500', // "Orange" + 'ff7f50', // "Coral" + 'ee82ee', // "Violet" + 'ecc255', // dark yellow + ); + } } |