From 33852375a77625bfbca706f888b99df6daceb033 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Wed, 24 Feb 2010 18:47:57 +0100 Subject: [PATCH] Use event state styles. --- kronolith/js/kronolith.js | 12 +++++++++++- kronolith/lib/Event.php | 8 ++++---- kronolith/themes/screen.css | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js index 0be132316..ec4dfd40b 100644 --- a/kronolith/js/kronolith.js +++ b/kronolith/js/kronolith.js @@ -1256,7 +1256,17 @@ KronolithCore = { event.value.nodeId = 'kronolithEvent' + view + event.value.calendar + date + event.key; _createElement = function(event) { - var el = new Element('div', { id: event.value.nodeId, className: 'kronolithEvent' }) + var className ='kronolithEvent'; + switch (event.value.x) { + case 3: + className += ' kronolithEventCancelled'; + break; + case 1: + case 4: + className += ' kronolithEventTentative'; + break; + } + var el = new Element('div', { id: event.value.nodeId, className: className }) .store('calendar', event.value.calendar) .store('eventid', event.key); if (!Object.isUndefined(event.value.aj)) { diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php index 1d379adfe..9ba03fa96 100644 --- a/kronolith/lib/Event.php +++ b/kronolith/lib/Event.php @@ -1218,7 +1218,7 @@ abstract class Kronolith_Event $json->e = $this->end->toJson(); $json->fi = $this->first; $json->la = $this->last; - $json->x = $this->status; + $json->x = (int)$this->status; $json->al = is_null($allDay) ? $this->isAllDay() : $allDay; $json->pe = $this->hasPermission(Horde_Perms::EDIT); $json->pd = $this->hasPermission(Horde_Perms::DELETE); @@ -2359,14 +2359,14 @@ abstract class Kronolith_Event { switch ($this->status) { case Kronolith::STATUS_CANCELLED: - return 'event-cancelled'; + return 'kronolithEventCancelled'; case Kronolith::STATUS_TENTATIVE: case Kronolith::STATUS_FREE: - return 'event-tentative'; + return 'kronolithEventTentative'; } - return 'event'; + return 'kronolithEvent'; } private function _formIDEncode($id) diff --git a/kronolith/themes/screen.css b/kronolith/themes/screen.css index fd9c627f3..01d18ba60 100644 --- a/kronolith/themes/screen.css +++ b/kronolith/themes/screen.css @@ -33,10 +33,10 @@ font-weight: bold; vertical-align: super; } -.event-tentative { +.kronolithEventTentative { font-style: italic; } -.event-cancelled { +.kronolithEventCancelled { text-decoration: line-through; } .event-time, .event-location { -- 2.11.0