From 1d344265c91351cf541e643506370c19640513c3 Mon Sep 17 00:00:00 2001 From: Thierry Pasqualier Date: Mon, 15 Oct 2007 11:25:38 +0000 Subject: [PATCH] Cal day view : fix a display bug with timezone --- webcit/calendar_view.c | 6 +++--- webcit/static/webcit.css | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index cf5414f7b..5b401d1d3 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -848,7 +848,7 @@ void calendar_day_view_display_events(time_t thetime, int year, int month, p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY); if ((show_event) && (p != NULL)) { - if ((t.day != today_start_t.day) && (end_t.day != today_start_t.day)) ongoing_event = 1; + if ((event_te.tm_mday != today_start_t.day) && (event_tm.tm_mday != today_start_t.day)) ongoing_event = 1; if (all_day_event) { @@ -872,8 +872,8 @@ void calendar_day_view_display_events(time_t thetime, int year, int month, { if ((hour == event_te.tm_hour) && ! ongoing_event ) { - if (t.day != today_start_t.day) event_te.tm_hour = 0; - if (end_t.day != today_start_t.day) event_tm.tm_hour = 24; + if (event_te.tm_mday != today_start_t.day) event_te.tm_hour = 0; + if (event_tm.tm_mday != today_start_t.day) event_tm.tm_hour = 24; if ((event_te.tm_hour < dstart) && (event_tm.tm_hour <= dstart)) { top = (event_te.tm_hour * 11) -1; diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index 466d3d776..b363d4c67 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -1148,7 +1148,6 @@ td.events_of_the_day { font-size: 8px; } - .hour_label, .extra_events dl dt { background-color: #CCCCDD; vertical-align: middle; -- 2.39.2