]> code.citadel.org Git - citadel.git/blobdiff - webcit/calendar_view.c
Cal day view : fix a display bug with timezone
[citadel.git] / webcit / calendar_view.c
index 54ebc2be1432340600fb1202575a3e69da6bdeb1..5b401d1d3ec881f804c3bc0a47bcc2da74ea389b 100644 (file)
@@ -1,4 +1,4 @@
-/*
+ /*
  * $Id$
  */
 /**
 #include "webcit.h"
 #include "webserver.h"
 
-#ifndef WEBCIT_WITH_CALENDAR_SERVICE
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
 
-/**\brief stub for non-libical builds */
-void do_calendar_view(void) {
-       wprintf("<center><i>");
-       wprintf(_("The calendar view is not available."));
-       wprintf("</i></center><br />\n");
-}
+/****************************************************************************/
 
-/**\brief stub for non-libical builds */
-void do_tasks_view(void) {     
-       wprintf("<center><I>");
-       wprintf(_("The tasks view is not available."));
-       wprintf("</i></center><br />\n");
-}
 
-#else  /* WEBCIT_WITH_CALENDAR_SERVICE */
+/**
+ */
+void embeddable_mini_calendar(int year, int month, char *urlformat)
+{
+       struct tm starting_tm;
+       struct tm tm;
+       time_t thetime;
+       int i;
+       time_t previous_month;
+       time_t next_month;
+       time_t colheader_time;
+       struct tm colheader_tm;
+       char colheader_label[32];
+       int weekstart = 0;
+       char weekstart_buf[16];
+       char url[256];
+       char div_id[256];
+
+       snprintf(div_id, sizeof div_id, "mini_calendar_%d", rand() );
+
+       /* Determine what day to start.
+        */
+       get_preference("weekstart", weekstart_buf, sizeof weekstart_buf);
+       weekstart = atoi(weekstart_buf);
+
+       /*
+        * Now back up to the 1st of the month...
+        */
+       memset(&starting_tm, 0, sizeof(struct tm));
+
+       starting_tm.tm_year = year - 1900;
+       starting_tm.tm_mon = month - 1;
+       starting_tm.tm_mday = 1;
+       thetime = mktime(&starting_tm);
+
+       memcpy(&tm, &starting_tm, sizeof(struct tm));
+       while (tm.tm_mday != 1) {
+               thetime = thetime - (time_t)86400;      /* go back 24 hours */
+               localtime_r(&thetime, &tm);
+       }
+
+       /** Determine previous and next months ... for links */
+       previous_month = thetime - (time_t)864000L;     /* back 10 days */
+       next_month = thetime + (time_t)(31L * 86400L);  /* ahead 31 days */
+
+       /** Now back up until we're on the user's preferred start day */
+       localtime_r(&thetime, &tm);
+       while (tm.tm_wday != weekstart) {
+               thetime = thetime - (time_t)86400;      /* go back 24 hours */
+               localtime_r(&thetime, &tm);
+       }
+
+       wprintf("<div class=\"mini_calendar\" id=\"%s\">\n", div_id);
+
+       localtime_r(&previous_month, &tm);
+
+       wprintf("<a href=\"javascript:minical_previous_month();\">&laquo;</a>");
+       wprintf("&nbsp;");
+/* previous month
+       wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+               (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+       wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
+*/
+
+       wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
+       wprintf("&nbsp;&nbsp;"
+               "<span class=\"mini_calendar_month_label\">"
+               "%s %d"
+               "</span>"
+               "&nbsp;&nbsp;", colheader_label, year);
+
+       wprintf("&nbsp;");
+       wprintf("<a href=\"javascript:minical_next_month();\">&raquo;</a>");
+/*
+       localtime_r(&next_month, &tm);
+       wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+               (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+       wprintf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
+*/
+
+       wprintf("<table border=0 cellpadding=1 cellspacing=1 class=\"mini_calendar_days\">"
+               "<tr>");
+       colheader_time = thetime;
+       for (i=0; i<7; ++i) {
+               colheader_time = thetime + (i * 86400) ;
+               localtime_r(&colheader_time, &colheader_tm);
+               wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm);
+               wprintf("<th>%c</th>", colheader_label[0]);
+
+       }
+       wprintf("</tr>\n");
+
+
+        /** Now do 35 or 42 days */
+        for (i = 0; i < 42; ++i) {
+                localtime_r(&thetime, &tm);
+
+                if (i < 35) {
+
+                       /** Before displaying Sunday, start a new row */
+                       if ((i % 7) == 0) {
+                               wprintf("<tr>");
+                       }
+
+                       if (tm.tm_mon == month-1) {
+                               snprintf(url, sizeof url, urlformat,
+                                       tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday);
+                               wprintf("<td><a href=\"%s\">%d</a></td>", url, tm.tm_mday);
+                       }
+                       else {
+                               wprintf("<td> </td>");
+                       }
+
+                       /** After displaying one week, end the row */
+                       if ((i % 7) == 6) {
+                               wprintf("</tr>\n");
+                       }
+
+               }
+
+               thetime += (time_t)86400;               /** ahead 24 hours */
+       }
+
+       wprintf("</table>"                      /** end of inner table */
+               "</div>\n");
+}
 
-/****************************************************************************/
 
 /**
  * \brief Display one day of a whole month view of a calendar
  * \param thetime the month we want to see 
  */
-void calendar_month_view_display_events(time_t thetime) {
+void calendar_month_view_display_events(int year, int month, int day)
+{
        int i;
-       time_t event_tt;
-       struct tm event_tm;
-       struct tm today_tm;
        icalproperty *p = NULL;
        icalproperty *q = NULL;
        struct icaltimetype t;
-       int month, day, year;
+       struct icaltimetype end_t;
+       struct icaltimetype today_start_t;
+       struct icaltimetype today_end_t;
+       struct tm starting_tm;
+       struct tm ending_tm;
        int all_day_event = 0;
-       time_t tt;
+       int show_event = 0;
        char buf[256];
+       struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
+       struct disp_cal *Cal;
+       time_t tt;
 
-       if (WC->num_cal == 0) {
+       if (WCC->num_cal == 0) {
                wprintf("<br /><br /><br />\n");
                return;
        }
 
-       localtime_r(&thetime, &today_tm);
-       month = today_tm.tm_mon + 1;
-       day = today_tm.tm_mday;
-       year = today_tm.tm_year + 1900;
-
-       for (i=0; i<(WC->num_cal); ++i) {
-               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                               ICAL_DTSTART_PROPERTY);
-               if (p != NULL) {
-                       t = icalproperty_get_dtstart(p);
-                       event_tt = icaltime_as_timet(t);
-
-                       if (t.is_date) all_day_event = 1;
-                       else all_day_event = 0;
-
-                       if (all_day_event) {
-                               gmtime_r(&event_tt, &event_tm);
-                       }
-                       else {
-                               localtime_r(&event_tt, &event_tm);
-                       }
+       /* Create an imaginary event which spans the 24 hours of today.  Any events which
+        * overlap with this one take place at least partially in this day.  We have to
+        * convert it from a struct tm in order to make it UTC.
+        */
+       memset(&starting_tm, 0, sizeof(struct tm));
+       starting_tm.tm_year = year - 1900;
+       starting_tm.tm_mon = month - 1;
+       starting_tm.tm_mday = day;
+       starting_tm.tm_hour = 0;
+       starting_tm.tm_min = 0;
+       today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone());
+       today_start_t.is_utc = 1;
+
+       memset(&ending_tm, 0, sizeof(struct tm));
+       ending_tm.tm_year = year - 1900;
+       ending_tm.tm_mon = month - 1;
+       ending_tm.tm_mday = day;
+       ending_tm.tm_hour = 23;
+       ending_tm.tm_min = 59;
+       today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
+       today_end_t.is_utc = 1;
+
+       /* Now loop through our list of events to see which ones occur today.
+        */
+       for (i=0; i<(WCC->num_cal); ++i) {
+               Cal = &WCC->disp_cal[i];
+               all_day_event = 0;
+               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
+               if (q != NULL) {
+                       t = icalproperty_get_dtstart(q);
+               }
+               else {
+                       memset(&t, 0, sizeof t);
+               }
+               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+               if (q != NULL) {
+                       end_t = icalproperty_get_dtend(q);
+               }
+               else {
+                       memset(&end_t, 0, sizeof end_t);
+               }
+               if (t.is_date) all_day_event = 1;
 
-                       if ((event_tm.tm_year == today_tm.tm_year)
-                          && (event_tm.tm_mon == today_tm.tm_mon)
-                          && (event_tm.tm_mday == today_tm.tm_mday)) {
+               if (all_day_event)
+               {
+                       show_event = ((t.year == year) && (t.month == month) && (t.day == day));
+               }
+               else
+               {
+                       show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
+               }
 
-                               p = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_SUMMARY_PROPERTY);
-                               if (p != NULL) {
+               /* If we determined that this event occurs today, then display it.
+                */
+               if (show_event) {
+                       p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
+                       if (p != NULL) {
 
-                                       if (all_day_event) {
-                                               wprintf("<table border=0 cellpadding=2><TR>"
-                                                       "<td bgcolor=\"#CCCCDD\">"
+                               if (all_day_event) {
+                                       wprintf("<table border=0 cellpadding=2><TR>"
+                                               "<td bgcolor=\"#CCCCDD\">"
                                                );
-                                       }
+                               }
 
-                                       wprintf("<font size=-1>"
-                                               "<a href=\"display_edit_event?"
-                                               "msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\""
-                                               " btt_tooltext=\"",
-                                               WC->disp_cal[i].cal_msgnum,
-                                               bstr("calview"),
-                                               bstr("year"),
-                                               bstr("month"),
-                                               bstr("day")
+                               wprintf("<font size=-1>"
+                                       "<a href=\"display_edit_event?"
+                                       "msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\""
+                                       " btt_tooltext=\"",
+                                       WC->disp_cal[i].cal_msgnum,
+                                       bstr("calview"),
+                                       bstr("year"),
+                                       bstr("month"),
+                                       bstr("day")
                                        );
 
-                                       wprintf("<i>%s</i> ", _("Summary:"));
-                                       escputs((char *)icalproperty_get_comment(p));
+                               wprintf("<i>%s</i> ", _("Summary:"));
+                               escputs((char *)icalproperty_get_comment(p));
+                               wprintf("<br />");
+                               
+                               q = icalcomponent_get_first_property(
+                                       WC->disp_cal[i].cal,
+                                       ICAL_LOCATION_PROPERTY);
+                               if (q) {
+                                       wprintf("<i>%s</i> ", _("Location:"));
+                                       escputs((char *)icalproperty_get_comment(q));
                                        wprintf("<br />");
-
-                                       q = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_LOCATION_PROPERTY);
-                                       if (q) {
-                                               wprintf("<i>%s</i> ", _("Location:"));
-                                               escputs((char *)icalproperty_get_comment(q));
-                                               wprintf("<br />");
                                        }
-
-                                       /**
-                                        * Only show start/end times if we're actually looking at the VEVENT
-                                        * component.  Otherwise it shows bogus dates for e.g. timezones
-                                        */
-                                       if (icalcomponent_isa(WC->disp_cal[i].cal) == ICAL_VEVENT_COMPONENT) {
                                
-                                               q = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                                                               ICAL_DTSTART_PROPERTY);
-                                               if (q != NULL) {
-                                                       t = icalproperty_get_dtstart(q);
-                               
-                                                       if (t.is_date) {
-                                                               struct tm d_tm;
-                                                               char d_str[32];
-                                                               memset(&d_tm, 0, sizeof d_tm);
-                                                               d_tm.tm_year = t.year - 1900;
-                                                               d_tm.tm_mon = t.month - 1;
-                                                               d_tm.tm_mday = t.day;
-                                                               wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
-                                                               wprintf("<i>%s</i> %s<br>",
-                                                                       _("Date:"), d_str);
-                                                       }
-                                                       else {
+                               /**
+                                * Only show start/end times if we're actually looking at the VEVENT
+                                * component.  Otherwise it shows bogus dates for e.g. timezones
+                                */
+                               if (icalcomponent_isa(Cal->cal) == ICAL_VEVENT_COMPONENT) {
+                                       
+                                       q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
+                                       if (q != NULL) {
+                                               t = icalproperty_get_dtstart(q);
+                                               
+                                               if (t.is_date) {
+                                                       struct tm d_tm;
+                                                       char d_str[32];
+                                                       memset(&d_tm, 0, sizeof d_tm);
+                                                       d_tm.tm_year = t.year - 1900;
+                                                       d_tm.tm_mon = t.month - 1;
+                                                       d_tm.tm_mday = t.day;
+                                                       wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
+                                                       wprintf("<i>%s</i> %s<br>",
+                                                               _("Date:"), d_str);
+                                               }
+                                               else {
+                                                       tt = icaltime_as_timet(t);
+                                                       fmt_date(buf, tt, 1);
+                                                       wprintf("<i>%s</i> %s<br>",
+                                                               _("Starting date/time:"), buf);
+                                                       
+                                                       /* Embed the 'show end date/time' loop inside here so it
+                                                        * only executes if this is NOT an all day event.
+                                                        */
+                                                       q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+                                                       if (q != NULL) {
+                                                               t = icalproperty_get_dtend(q);
                                                                tt = icaltime_as_timet(t);
                                                                fmt_date(buf, tt, 1);
-                                                               wprintf("<i>%s</i> %s<br>",
-                                                                       _("Starting date/time:"), buf);
-
-                                                               /* Embed the 'show end date/time' loop inside here so it
-                                                                * only executes if this is NOT an all day event.
-                                                                */
-                                                               q = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                                                                                       ICAL_DTEND_PROPERTY);
-                                                               if (q != NULL) {
-                                                                       t = icalproperty_get_dtend(q);
-                                                                       tt = icaltime_as_timet(t);
-                                                                       fmt_date(buf, tt, 1);
-                                                                       wprintf("<i>%s</i> %s<br>",
-                                                                               _("Ending date/time:"), buf);
-                                                               }
-
+                                                               wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
                                                        }
+                                                       
                                                }
-                                       
                                        }
-
-                                       q = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_DESCRIPTION_PROPERTY);
-                                       if (q) {
-                                               wprintf("<i>%s</i> ", _("Notes:"));
-                                               escputs((char *)icalproperty_get_comment(q));
-                                               wprintf("<br />");
-                                       }
-
-                                       wprintf("\">");
-                                       escputs((char *)
-                                               icalproperty_get_comment(p));
-                                       wprintf("</a></font><br />\n");
-
-                                       if (all_day_event) {
-                                               wprintf("</td></tr></table>");
-                                       }
-
+                                       
                                }
-
+                               
+                               q = icalcomponent_get_first_property(Cal->cal, ICAL_DESCRIPTION_PROPERTY);
+                               if (q) {
+                                       wprintf("<i>%s</i> ", _("Notes:"));
+                                       escputs((char *)icalproperty_get_comment(q));
+                                       wprintf("<br />");
+                               }
+                               
+                               wprintf("\">");
+                               escputs((char *)
+                                       icalproperty_get_comment(p));
+                               wprintf("</a></font><br />\n");
+                               
+                               if (all_day_event) {
+                                       wprintf("</td></tr></table>");
+                               }
+                               
                        }
-
-
+                       
                }
+               
+               
        }
 }
 
@@ -203,11 +342,12 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
        struct icaltimetype t;
        int month, day, year;
        int all_day_event = 0;
-       char calhourformat[16];
        char *timeformat;
+       int time_format;
+       
+       time_format = get_time_format_cached ();
 
-       get_preference("calhourformat", calhourformat, sizeof calhourformat);
-       if (!strcasecmp(calhourformat, "24"))   timeformat="%k:%M";
+       if (time_format == WC_TIMEFORMAT_24) timeformat="%k:%M";
        else timeformat="%I:%M %p";
 
        localtime_r(&thetime, &today_tm);
@@ -307,11 +447,20 @@ void calendar_month_view(int year, int month, int day) {
        time_t colheader_time;
        struct tm colheader_tm;
        char colheader_label[32];
+       int chg_month = 0;
+       int weekstart = 0;
+       char weekstart_buf[16];
 
-       /** Determine what day to start.
-        * First, back up to the 1st of the month...
+       /* Determine what day to start.
+        */
+       get_preference("weekstart", weekstart_buf, sizeof weekstart_buf);
+       weekstart = atoi(weekstart_buf);
+
+       /*
+        * Now back up to the 1st of the month...
         */
        memset(&starting_tm, 0, sizeof(struct tm));
+
        starting_tm.tm_year = year - 1900;
        starting_tm.tm_mon = month - 1;
        starting_tm.tm_mday = day;
@@ -327,17 +476,16 @@ void calendar_month_view(int year, int month, int day) {
        previous_month = thetime - (time_t)864000L;     /* back 10 days */
        next_month = thetime + (time_t)(31L * 86400L);  /* ahead 31 days */
 
-       /** Now back up until we're on a Sunday */
+       /** Now back up until we're on the user's preferred start day */
        localtime_r(&thetime, &tm);
-       while (tm.tm_wday != 0) {
+       while (tm.tm_wday != weekstart) {
                thetime = thetime - (time_t)86400;      /* go back 24 hours */
                localtime_r(&thetime, &tm);
        }
 
        /** Outer table (to get the background color) */
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=100%% border=0 cellpadding=0 cellspacing=0 "
-               "bgcolor=#204B78><TR><TD>\n");
+               "<table class=\"calendar\"> \n <tr><td>"); 
 
        wprintf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
 
@@ -376,39 +524,55 @@ void calendar_month_view(int year, int month, int day) {
        }
        wprintf("</tr>\n");
 
-       /** Now do 35 days */
-       for (i = 0; i < 35; ++i) {
-               localtime_r(&thetime, &tm);
 
-               /** Before displaying Sunday, start a new row */
-               if ((i % 7) == 0) {
-                       wprintf("<tr>");
-               }
+        /** Now do 35 or 42 days */
+        for (i = 0; i < 42; ++i) {
+                localtime_r(&thetime, &tm);
 
-               wprintf("<td bgcolor=\"#%s\" width=14%% height=60 align=left valign=top><b>",
-                       ((tm.tm_mon != month-1) ? "DDDDDD" :
-                       ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" :
-                       "FFFFFF"))
-               );
-               if ((i==0) || (tm.tm_mday == 1)) {
-                       wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm);
-                       wprintf("%s ", colheader_label);
-               }
-               wprintf("<a href=\"readfwd?calview=day&year=%d&month=%d&day=%d\">"
-                       "%d</a></b><br />",
-                       tm.tm_year + 1900,
-                       tm.tm_mon + 1,
-                       tm.tm_mday,
-                       tm.tm_mday);
+                if ((i < 35) || (chg_month == 0)) {
 
-               /** put the data here, stupid */
-               calendar_month_view_display_events(thetime);
+                        if ((i > 27) && ((tm.tm_mday == 1) || (tm.tm_mday == 31))) {
+                                chg_month = 1;
+                        }
+                        if (i > 35) {
+                                chg_month = 0;
+                        }
 
-               wprintf("</td>");
+                       /** Before displaying Sunday, start a new row */
+                       if ((i % 7) == 0) {
+                               wprintf("<tr>");
+                       }
+
+                       wprintf("<td class=\"cal%s\"><div class=\"day\">",
+                               ((tm.tm_mon != month-1) ? "out" :
+                               ((tm.tm_wday==0 || tm.tm_wday==6) ? "weekend" :
+                               "day"))
+                       );
+                       if ((i==0) || (tm.tm_mday == 1)) {
+                               wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm);
+                               wprintf("%s ", colheader_label);
+                       }
+                       wprintf("<a href=\"readfwd?calview=day&year=%d&month=%d&day=%d\">"
+                               "%d</a></div>",
+                               tm.tm_year + 1900,
+                               tm.tm_mon + 1,
+                               tm.tm_mday,
+                               tm.tm_mday);
+
+                       /** put the data here, stupid */
+                       calendar_month_view_display_events(
+                               tm.tm_year + 1900,
+                               tm.tm_mon + 1,
+                               tm.tm_mday
+                       );
+
+                       wprintf("</td>");
+
+                       /** After displaying Saturday, end the row */
+                       if ((i % 7) == 6) {
+                               wprintf("</tr>\n");
+                       }
 
-               /** After displaying Saturday, end the row */
-               if ((i % 7) == 6) {
-                       wprintf("</tr>\n");
                }
 
                thetime += (time_t)86400;               /** ahead 24 hours */
@@ -581,82 +745,177 @@ void calendar_week_view(int year, int month, int day) {
  * \param year the year
  * \param month the month
  * \param day the day
- * \param hour the hour we want to start displaying?????
+ * \param hour the hour we want to start displaying
+ * \param dstart daystart 
+ * \param dend dayend 
  */
-void calendar_day_view_display_events(int year, int month,
-                                       int day, int hour) {
+void calendar_day_view_display_events(time_t thetime, int year, int month,
+                                       int day, int hour,
+                                       int dstart, int dend) {
        int i;
-       icalproperty *p;
-       struct icaltimetype t;
+       icalproperty *p = NULL;
+       icalproperty *q = NULL;
+       time_t event_start;
+       time_t event_end;
        time_t event_tt;
-       struct tm *event_tm;
+       time_t event_tte;
+       struct tm event_te;
+       struct tm event_tm;
+       int show_event = 0;
        int all_day_event = 0;
+       int ongoing_event = 0;
+       struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
+       struct disp_cal *Cal;
+       struct icaltimetype t;
+       struct icaltimetype end_t;
+       struct icaltimetype today_start_t;
+       struct icaltimetype today_end_t;
+       struct tm starting_tm;
+       struct tm ending_tm;
+       int top = 0;
+       int height = 0;
 
-       if (WC->num_cal == 0) {
+       if (WCC->num_cal == 0) {
                // \todo FIXME wprintf("<br /><br /><br />\n");
                return;
        }
 
-       for (i=0; i<(WC->num_cal); ++i) {
-               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                               ICAL_DTSTART_PROPERTY);
-               if (p != NULL) {
-                       t = icalproperty_get_dtstart(p);
-                       event_tt = icaltime_as_timet(t);
-                       if (t.is_date) {
-                               all_day_event = 1;
-                       }
-                       else {
-                               all_day_event = 0;
-                       }
+       event_start = thetime + 60 * 60 * hour;
+       event_end = thetime + 60 * 60 * (hour + 1);
 
-                       if (all_day_event) {
-                               event_tm = gmtime(&event_tt);
-                       }
-                       else {
-                               event_tm = localtime(&event_tt);
-                       }
 
-                       if ((event_tm->tm_year == (year-1900))
-                          && (event_tm->tm_mon == (month-1))
-                          && (event_tm->tm_mday == day)
-                          && ( ((event_tm->tm_hour == hour)&&(!t.is_date)) || ((hour<0)&&(t.is_date)) )
-                          ) {
+       /* Create an imaginary event which spans the current hour.  Any events which
+        * overlap with this one take place at least partially in this day.
+        */
+       memset(&starting_tm, 0, sizeof(struct tm));
+       starting_tm.tm_year = year - 1900;
+       starting_tm.tm_mon = month - 1;
+       starting_tm.tm_mday = day;
+       starting_tm.tm_hour = hour;
+       starting_tm.tm_min = 0;
+       today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone());
+       today_start_t.is_utc = 1;
+
+       memset(&ending_tm, 0, sizeof(struct tm));
+       ending_tm.tm_year = year - 1900;
+       ending_tm.tm_mon = month - 1;
+       ending_tm.tm_mday = day;
+       ending_tm.tm_hour = hour;
+       ending_tm.tm_min = 59;
+       today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
+       today_end_t.is_utc = 1;
+
+       /* Now loop through our list of events to see which ones occur today.
+        */
+       for (i=0; i<(WCC->num_cal); ++i) {
+               Cal = &WCC->disp_cal[i];
 
+               all_day_event = 0;
+               ongoing_event=0;
 
-                               p = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_SUMMARY_PROPERTY);
-                               if (p != NULL) {
+               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
+               if (q != NULL) {
+                       t = icalproperty_get_dtstart(q);
+                       event_tt = icaltime_as_timet(t);
+                       localtime_r(&event_tt, &event_te);
+               }
+               else {
+                       memset(&t, 0, sizeof t);
+               }
+               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+               if (q != NULL) {
+                       end_t = icalproperty_get_dtend(q);
+                       event_tte = icaltime_as_timet(end_t);
+                       localtime_r(&event_tte, &event_tm);
+               }
+               else {
+                       memset(&end_t, 0, sizeof end_t);
+               }
+               if (t.is_date) all_day_event = 1;
 
-                                       if (all_day_event) {
-                                               wprintf("<table border=1 cellpadding=2><TR>"
-                                                       "<td bgcolor=\"#CCCCCC\">"
-                                               );
-                                       }
+               if (all_day_event)
+               {
+                       show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (hour == -1));
+               }
+               else
+               {
+                       show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
+               }
 
-                                       wprintf("<font size=-1>"
-                                               "<a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d\">",
-                                               WC->disp_cal[i].cal_msgnum,
-                                               year, month, day
-                                       );
-                                       escputs((char *)
-                                               icalproperty_get_comment(p));
-                                       wprintf("</a></font><br />\n");
+               /* If we determined that this event occurs today, then display it.
+                */
+               p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY);
+               if ((show_event) && (p != NULL)) {
+
+                       if ((event_te.tm_mday != today_start_t.day) && (event_tm.tm_mday != today_start_t.day)) ongoing_event = 1; 
+
+                       if (all_day_event) 
+                       {
+                               wprintf("<li><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
+                                       Cal->cal_msgnum, year, month, day, hour);
+                               escputs((char *) icalproperty_get_comment(p));
+                               wprintf("</a> (");
+                               wprintf(_("All day event"));
+                               wprintf(")</li>\n");
+                       }
+                       else if (ongoing_event && (hour == -1)) 
+                       {
+                               wprintf("<li><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
+                                       Cal->cal_msgnum, year, month, day, hour);
+                               escputs((char *) icalproperty_get_comment(p));
+                               wprintf("</a> (");
+                               wprintf(_("Ongoing event"));
+                               wprintf(")</li>\n");
+                       }
+                       else 
+                       {
+                               if ((hour == event_te.tm_hour) && ! ongoing_event ) {
+
+                                       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 (all_day_event) {
-                                               wprintf("</td></tr></table>");
+                                       if ((event_te.tm_hour < dstart) && (event_tm.tm_hour <= dstart)) {
+                                               top = (event_te.tm_hour * 11) -1;
+                                               height= (event_tm.tm_hour - event_te.tm_hour) * 11;
+                                       }
+                                       if ((event_te.tm_hour < dstart) && (event_tm.tm_hour >= dstart)) {
+                                               top = (event_te.tm_hour * 11) - 1;
+                                               height = ((dstart - event_te.tm_hour) * 11) + ((event_tm.tm_hour - dstart) * 31);
+                                       }
+                                       if ((event_te.tm_hour <= dstart) && (event_tm.tm_hour > dend)) {
+                                               top = (event_te.tm_hour * 11) - 1;
+                                               height = ((dstart - event_te.tm_hour) * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 10);
                                        }
+                                       if ((event_te.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
+                                               top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) - 1;
+                                               height = ((event_tm.tm_hour - event_te.tm_hour) * 31);
+                                       }
+                                       if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend) && (event_tm.tm_hour > dend)) {
+                                               top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) - 1;
+                                               height = (((dend - event_te.tm_hour + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 11));
+                                       }
+                                       if ((event_te.tm_hour > dend) && (event_tm.tm_hour > dend)) {
+                                               top = (dstart * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - event_te.tm_hour) * 11) - 1;
+                                               height = ((event_tm.tm_hour - event_te.tm_hour) * 11);
+                                       }
+                               wprintf("<dd  class=\"event\" "
+                                       "style=\"position: absolute; "
+                                       "top:%dpx; left:100px; "
+                                       "height:%dpx; \" >",
+                                       top, height
+                                       );
+                               wprintf("<a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d&case=%d\">",
+                                       Cal->cal_msgnum, year, month, day, t.hour, hour);
+                               escputs((char *) icalproperty_get_comment(p));
+                               wprintf("</a></dd>\n");
                                }
-
+                               
                        }
-
-
                }
        }
 }
 
-
 /**
  * \brief view one day
  * \param year the year
@@ -666,19 +925,26 @@ void calendar_day_view_display_events(int year, int month,
 void calendar_day_view(int year, int month, int day) {
        int hour;
        struct icaltimetype today, yesterday, tomorrow;
-       char calhourformat[16];
        int daystart = 8;
        int dayend = 17;
        char daystart_str[16], dayend_str[16];
        struct tm d_tm;
        char d_str[128];
+       int time_format;
+       time_t today_t;
 
-       get_preference("calhourformat", calhourformat, sizeof calhourformat);
+       time_format = get_time_format_cached ();
        get_preference("daystart", daystart_str, sizeof daystart_str);
        if (!IsEmptyStr(daystart_str)) daystart = atoi(daystart_str);
        get_preference("dayend", dayend_str, sizeof dayend_str);
        if (!IsEmptyStr(dayend_str)) dayend = atoi(dayend_str);
        
+       /** Today's date */
+       memset(&d_tm, 0, sizeof d_tm);
+       d_tm.tm_year = year - 1900;
+       d_tm.tm_mon = month - 1;
+       d_tm.tm_mday = day;
+       today_t = mktime(&d_tm); 
 
        /** Figure out the dates for "yesterday" and "tomorrow" links */
 
@@ -696,40 +962,23 @@ void calendar_day_view(int year, int month, int day) {
        ++tomorrow.day;
        tomorrow = icaltime_normalize(tomorrow);
 
-
-       /** Outer table (to get the background color) */
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=100%% border=0 cellpadding=0 cellspacing=0 "
-               "bgcolor=#204B78><tr><td>\n");
+       wprintf("<div class=\"fix_scrollbar_bug\">");
 
        /** Inner table (the real one) */
-       wprintf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#204B78><tr>\n");
-
-       /** Innermost table (contains hours etc.) */
-       wprintf("<td width=80%%>"
-               "<table width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#204B78>\n");
-
-       /** Display events before 8:00 (hour=-1 is all-day events) */
-       wprintf("<tr>"
-               "<td bgcolor=\"#CCCCDD\" valign=middle width=10%%></td>"
-               "<td bgcolor=\"#FFFFFF\" valign=top>");
-       for (hour = (-1); hour <= (daystart-1); ++hour) {
-               calendar_day_view_display_events(year, month, day, hour);
-       }
-       wprintf("</td></tr>\n");
+       wprintf("<table class=\"calendar\" id=\"inner_day\"><tr> \n");
 
+       /** Innermost cell (contains hours etc.) */
+       wprintf("<td class=\"events_of_the_day\" >");
+               wprintf("<dl class=\"events\" >");
        /** Now the middle of the day... */     
-       for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */
-               wprintf("<tr height=30><td bgcolor=\"#CCCCDD\" align=middle "
-                       "valign=middle width=10%%>");
-               wprintf("<a href=\"display_edit_event?msgnum=0"
+       for (hour = 0; hour < 24; ++hour) {     /* could do HEIGHT=xx */
+               wprintf("<dt class=\"hour%s\"><a href=\"display_edit_event?msgnum=0"
                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+                       (hour < daystart ? "before" : (hour > dayend ? "after" : "")),
                        year, month, day, hour
                );
 
-               if (!strcasecmp(calhourformat, "24")) {
+               if (time_format == WC_TIMEFORMAT_24) {
                        wprintf("%2d:00</a> ", hour);
                }
                else {
@@ -739,30 +988,30 @@ void calendar_day_view(int year, int month, int day) {
                        );
                }
 
-               wprintf("</td><td bgcolor=\"#FFFFFF\" valign=top>");
+               wprintf("</dt>");
+       
 
                /* put the data here, stupid */
-               calendar_day_view_display_events(year, month, day, hour);
+               calendar_day_view_display_events(today_t, year, month, day, hour, daystart, dayend);
 
-               wprintf("</td></tr>\n");
        }
 
-       /** Display events after 5:00... */
-       wprintf("<tr>"
-               "<td bgcolor=\"#CCCCDD\" valign=middle width=10%%></td>"
-               "<td bgcolor=\"#FFFFFF\" valign=top>");
-       for (hour = (dayend+1); hour <= 23; ++hour) {
-               calendar_day_view_display_events(year, month, day, hour);
-       }
-       wprintf("</td></tr>\n");
+               wprintf("</dl>");
+       wprintf("</td>");                       /* end of innermost table */
 
+       /** Extra events on the middle */
+        wprintf("<td class=\"extra_events\">");
 
-       wprintf("</table>"                      /* end of innermost table */
-               "</td>"
-       );
+        wprintf("<ul>");
+
+        /** Display all-day events) */
+                calendar_day_view_display_events(today_t, year, month, day, -1, daystart, dayend);
+
+        wprintf("</ul>");
 
-       wprintf("<td width=20%% valign=top>");  /* begin stuff-on-the-right */
+       wprintf("</td>");       /** end extra on the middle */
 
+       wprintf("<td width=20%% align=center valign=top>");     /** begin stuff-on-the-right */
 
        /** Begin todays-date-with-left-and-right-arrows */
        wprintf("<table border=0 width=100%% "
@@ -776,11 +1025,6 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>");
        wprintf("</td>");
 
-       /** Today's date */
-       memset(&d_tm, 0, sizeof d_tm);
-       d_tm.tm_year = year - 1900;
-       d_tm.tm_mon = month - 1;
-       d_tm.tm_mday = day;
        wc_strftime(d_str, sizeof d_str,
                "<td align=center>"
                "<font size=+2>%B</font><br />"
@@ -796,28 +1040,30 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<a href=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
                tomorrow.year, tomorrow.month, tomorrow.day);
        wprintf("<img align=middle src=\"static/nextdate_32x.gif\""
-               " border=0></A>\n");
+               " border=0></a>\n");
        wprintf("</td>");
 
        wprintf("</tr></table>\n");
        /** End todays-date-with-left-and-right-arrows */
 
-       /** \todo In the future we might want to put a month-o-matic here */
+       /** Embed a mini month calendar in this space */
+       wprintf("<br />\n");
+       embeddable_mini_calendar(year, month, "readfwd?calview=day&year=%d&month=%d&day=%d");
 
        wprintf("</font></center>\n");
 
-       wprintf("</td>");                       /** end stuff-on-the-right */
-
-
-
-       wprintf("</tr></table>"                 /** end of inner table */
-               "</td></tr></table></div>"      /** end of outer table */
-       );
-
+       wprintf("</td></tr>");                  /** end stuff-on-the-right */
 
+       wprintf("</table>"                      /** end of inner table */
+               "</div>");
 
+        wprintf("<script type=\"text/javascript\">"
+                " setTimeout(\"btt_enableTooltips('inner_day')\", 1); "
+                "</script>\n"
+        );
 }
 
+
 /**
  * \brief Display today's events.
  */
@@ -1070,6 +1316,23 @@ void do_tasks_view(void) {
 
 }
 
+#else  /* WEBCIT_WITH_CALENDAR_SERVICE */
+
+/**\brief stub for non-libical builds */
+void do_calendar_view(void) {
+       wprintf("<center><i>");
+       wprintf(_("The calendar view is not available."));
+       wprintf("</i></center><br />\n");
+}
+
+/**\brief stub for non-libical builds */
+void do_tasks_view(void) {     
+       wprintf("<center><I>");
+       wprintf(_("The tasks view is not available."));
+       wprintf("</i></center><br />\n");
+}
+
+
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
 /** @} */