Cal day view : fix a display bug with timezone

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index cf5414f7b20b1f54982966261b6fc489eefc98a5..5b401d1d3ec881f804c3bc0a47bcc2da74ea389b 100644 (file)
--- 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 466d3d7764f0befb8954e67bb4e5f34c6f951392..b363d4c670d4fc5eb87c8db76c6b589d3870922a 100644 (file)
--- 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;