HUGE PATCH. This moves all of mime_parser.c and all
[citadel.git] / webcit / calendar_view.c
index b9f212a765842b792a28399ae6826cada58a41e1..b5525b1beb5274d461db2a0b257f008fa628005d 100644 (file)
 
 /****************************************************************************/
 
+
+void embeddable_mini_calendar(int year, int month, char *urlformat)
+{
+       struct tm starting_tm;
+       struct tm tm;
+       time_t thetime;
+       int i, len;
+       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];
+       char escaped_urlformat[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);
+
+       /* Previous month link */
+       localtime_r(&previous_month, &tm);
+       wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">&laquo;</a>", 
+               (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+
+       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);
+
+       /* Next month link */
+       localtime_r(&next_month, &tm);
+       wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">&raquo;</a>",
+               (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+
+       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");
+
+       /* javascript for previous and next month */
+       len = strlen(urlformat);
+       for (i=0; i<len; ++i) {
+               sprintf(&escaped_urlformat[i*2], "%02X", urlformat[i]);
+       }
+
+       wprintf("<script type=\"text/javascript\">                                                      "
+               "       function minical_change_month(year, month) {                                    "
+               "               p = 'year=' + year + '&month=' + month                                  "
+               "                       + '&urlformat=%s&r=' + CtdlRandomString();                      "
+               "               new Ajax.Updater('%s', 'mini_calendar',                                 "
+               "                       { method: 'get', parameters: p, evalScripts: true } );          "
+               "       }                                                                               "
+               "</script>\n"
+               ,
+               escaped_urlformat, div_id
+       );
+
+}
+
+/* ajax embedder for the above mini calendar */
+void ajax_mini_calendar(void) {
+       char urlformat[256];
+       int i, len;
+       char *escaped_urlformat;
+
+       escaped_urlformat = bstr("urlformat");
+        len = strlen(escaped_urlformat) * 2 ;
+       for (i=0; i<len; ++i) {
+               urlformat[i] = xtoi(&escaped_urlformat[i*2], 2);
+               urlformat[i+1] = 0;
+       }
+
+       embeddable_mini_calendar( atoi(bstr("year")), atoi(bstr("month")), urlformat );
+}
+
+
 /**
  * \brief Display one day of a whole month view of a calendar
  * \param thetime the month we want to see 
@@ -106,14 +260,11 @@ void calendar_month_view_display_events(int year, int month, int day)
 
                                wprintf("<font size=-1>"
                                        "<a href=\"display_edit_event?"
-                                       "msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\""
+                                       "msgnum=%ld&calview=month&year=%d&month=%d&day=%d\""
                                        " btt_tooltext=\"",
                                        WC->disp_cal[i].cal_msgnum,
-                                       bstr("calview"),
-                                       bstr("year"),
-                                       bstr("month"),
-                                       bstr("day")
-                                       );
+                                       year, month, day
+                               );
 
                                wprintf("<i>%s</i> ", _("Summary:"));
                                escputs((char *)icalproperty_get_comment(p));
@@ -151,7 +302,7 @@ void calendar_month_view_display_events(int year, int month, int day)
                                                }
                                                else {
                                                        tt = icaltime_as_timet(t);
-                                                       fmt_date(buf, tt, 1);
+                                                       webcit_fmt_date(buf, tt, 1);
                                                        wprintf("<i>%s</i> %s<br>",
                                                                _("Starting date/time:"), buf);
                                                        
@@ -162,7 +313,7 @@ void calendar_month_view_display_events(int year, int month, int day)
                                                        if (q != NULL) {
                                                                t = icalproperty_get_dtend(q);
                                                                tt = icaltime_as_timet(t);
-                                                               fmt_date(buf, tt, 1);
+                                                               webcit_fmt_date(buf, tt, 1);
                                                                wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
                                                        }
                                                        
@@ -268,12 +419,11 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
                                        minutes=difftime % 60;
                                        wprintf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
                                                        "<font size=-1>"
-                                                       "<a href=\"display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
+                                                       "<a href=\"display_edit_event?msgnum=%ld&calview=calbrief&year=%s&month=%s&day=%s\">",
                                                        daycolor,
                                                        hours, minutes,
                                                        daycolor,
                                                        WC->disp_cal[i].cal_msgnum,
-                                                       bstr("calview"),
                                                        bstr("year"),
                                                        bstr("month"),
                                                        bstr("day")
@@ -389,7 +539,7 @@ void calendar_month_view(int year, int month, int day) {
                colheader_time = thetime + (i * 86400) ;
                localtime_r(&colheader_time, &colheader_tm);
                wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm);
-               wprintf("<td align=center width=14%%>"
+               wprintf("<th align=center width=14%%>"
                        "<font color=\"#FFFFFF\">%s</font></th>", colheader_label);
 
        }
@@ -620,14 +770,17 @@ void calendar_week_view(int year, int month, int day) {
  * \param dstart daystart 
  * \param dend dayend 
  */
-void calendar_day_view_display_events(time_t thetime, int year, int month,
-                                       int day, int hour,
-                                       int dstart, int dend) {
+void calendar_day_view_display_events(time_t thetime,
+                               int year,
+                               int month,
+                               int day,
+                               int notime_events,
+                               int dstart,
+                               int dend)
+{
        int i;
        icalproperty *p = NULL;
        icalproperty *q = NULL;
-       time_t event_start;
-       time_t event_end;
        time_t event_tt;
        time_t event_tte;
        struct tm event_te;
@@ -644,25 +797,29 @@ void calendar_day_view_display_events(time_t thetime, int year, int month,
        struct tm starting_tm;
        struct tm ending_tm;
        int top = 0;
-       int height = 0;
+       int bottom = 0;
+       int gap = 1;
+       int startmin = 0;
+       int diffmin = 0;
+       int endmin = 0;
+
+        char buf[256];
+        struct tm d_tm;
+        char d_str[32];
 
        if (WCC->num_cal == 0) {
-               // \todo FIXME wprintf("<br /><br /><br />\n");
+               /* nothing to display */
                return;
        }
 
-       event_start = thetime + 60 * 60 * hour;
-       event_end = thetime + 60 * 60 * (hour + 1);
-
-
-       /* Create an imaginary event which spans the current hour.  Any events which
+       /* Create an imaginary event which spans the current day.  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_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;
@@ -671,7 +828,7 @@ void calendar_day_view_display_events(time_t thetime, int year, int month,
        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_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;
@@ -706,82 +863,166 @@ void calendar_day_view_display_events(time_t thetime, int year, int month,
 
                if (all_day_event)
                {
-                       show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (hour == -1));
+                       show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (notime_events));
                }
                else
                {
                        show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
                }
 
                /* 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 ((t.day != today_start_t.day) && (end_t.day != today_start_t.day)) ongoing_event = 1; 
+                       if ((event_te.tm_mday != day) || (event_tm.tm_mday != day)) ongoing_event = 1; 
 
-                       if (all_day_event
+                       if (all_day_event && notime_events)
                        {
-                               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");
+                              wprintf("<li class=\"event\"> "
+                                "<a href=\"display_edit_event?"
+                                "msgnum=%ld&calview=day&year=%d&month=%d&day=%d\" "
+                                " class=\"event_title\" "
+                                " btt_tooltext=\"",
+                                        Cal->cal_msgnum, year, month, day);
+                                wprintf("<i>%s</i><br />", _("All day event"));
+                                wprintf("<i>%s</i> ",    _("Summary:"));
+                                escputs((char *) icalproperty_get_comment(p));
+                                wprintf("<br />");
+                               q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+                                if (q) {
+                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wprintf("<br />");
+                                        }
+                                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);
+                               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> <span>(");
+                                wprintf(_("All day event"));
+                                wprintf(")</span></li>\n");
                        }
-                       else if (ongoing_event && (hour == -1)
+                       else if (ongoing_event && notime_events
                        {
-                               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);
+                               wprintf("<li class=\"event\"> "
+                               "<a href=\"display_edit_event?"
+                               "msgnum=%ld&calview=day&year=%d&month=%d&day=%d\" "
+                               " class=\"event_title\" " 
+                                "btt_tooltext=\"",
+                               Cal->cal_msgnum, year, month, day);
+                                wprintf("<i>%s</i><br />", _("Ongoing event"));
+                                wprintf("<i>%s</i> ",    _("Summary:"));
+                                escputs((char *) icalproperty_get_comment(p));
+                                wprintf("<br />");
+                                q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+                                if (q) {
+                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wprintf("<br />");
+                                        }
+                                webcit_fmt_date(buf, event_tt, 1);
+                                wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+                                webcit_fmt_date(buf, event_tte, 1);
+                                wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+                                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> (");
+                               wprintf("</a> <span>(");
                                wprintf(_("Ongoing event"));
-                               wprintf(")</li>\n");
+                               wprintf(")</span></li>\n");
                        }
-                       else 
+                       else if (!all_day_event && !notime_events)
                        {
-                               if ((hour == event_te.tm_hour) && ! ongoing_event ) {
+                               gap++;
 
-                                       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 != day) event_te.tm_hour = 0;
+                               if (event_tm.tm_mday != day) event_tm.tm_hour = 24;
+
+                               /* Calculate the location of the top of the box */
+                               if (event_te.tm_hour < dstart) {
+                                       startmin = diffmin = event_te.tm_min / 6;
+                                       top = (event_te.tm_hour * 10) + startmin;
+                               }
+                               else if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend)) {
+                                       startmin = diffmin = (event_te.tm_min / 2);
+                                       top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + startmin;
+                               }
+                               else if (event_te.tm_hour >dend) {
+                                       startmin = diffmin = event_te.tm_min / 6;
+                                       top = (dstart * 10) + ((dend - dstart - 1) * 30) + ((event_tm.tm_hour - dend + 1) * 10) + startmin ;
+                               }
+                               else {
+                                       /* should never get here */
+                               }
+
+                               /* Calculate the location of the bottom of the box */
+                               if (event_tm.tm_hour < dstart) {
+                                       endmin = diffmin = event_tm.tm_min / 6;
+                                       bottom = (event_tm.tm_hour * 10) + endmin;
+                               }
+                               else if ((event_tm.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
+                                       endmin = diffmin = (event_tm.tm_min / 2);
+                                       bottom = (dstart * 10) + ((event_tm.tm_hour - dstart) * 30) + endmin ;
+                               }
+                               else if (event_tm.tm_hour >dend) {
+                                       endmin = diffmin = event_tm.tm_min / 6;
+                                       bottom = (dstart * 10) + ((dend - dstart + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10) + endmin;
+                               }
+                               else {
+                                       /* should never get here */
+                               }
 
-                                       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; "
+                                       "top:%dpx; left:%dpx; "
                                        "height:%dpx; \" >",
-                                       top, height
+                                       top, (gap * 40), (bottom-top)
                                        );
-                               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);
+                               wprintf("<a href=\"display_edit_event?"
+                                       "msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\" "
+                                       "class=\"event_title\" "
+                                               "btt_tooltext=\"",
+                                       Cal->cal_msgnum, year, month, day, t.hour);
+                                wprintf("<i>%s</i> ",    _("Summary:"));
+                                escputs((char *) icalproperty_get_comment(p));
+                                wprintf("<br />");
+                                q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+                                if (q) {
+                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wprintf("<br />");
+                                        }
+                                webcit_fmt_date(buf, event_tt, 1);
+                                wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+                                webcit_fmt_date(buf, event_tte, 1);
+                                wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+                               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></dd>\n");
-                               }
-                               
                        }
                }
        }
@@ -803,6 +1044,9 @@ void calendar_day_view(int year, int month, int day) {
        char d_str[128];
        int time_format;
        time_t today_t;
+       int timeline = 30;
+       int extratimeline = 0;
+       int gap = 0;
 
        time_format = get_time_format_cached ();
        get_preference("daystart", daystart_str, sizeof daystart_str);
@@ -841,11 +1085,21 @@ void calendar_day_view(int year, int month, int day) {
        /** Innermost cell (contains hours etc.) */
        wprintf("<td class=\"events_of_the_day\" >");
                wprintf("<dl class=\"events\" >");
-       /** Now the middle of the day... */     
-       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" : "")),
+
+       /** Now the middle of the day... */
+
+       extratimeline = timeline / 3;   
+
+       for (hour = 0; hour < daystart; ++hour) {       /* could do HEIGHT=xx */
+               wprintf("<dt class=\"extrahour\"        "
+                       "style=\"               "
+                       "position: absolute;    "
+                       "top: %dpx; left: 0px;  "
+                       "height: %dpx;          "       
+                       "\" >                   "
+                       "<a href=\"display_edit_event?msgnum=0"
+                       "&calview=day&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+                       (hour * extratimeline ), extratimeline, 
                        year, month, day, hour
                );
 
@@ -860,29 +1114,83 @@ void calendar_day_view(int year, int month, int day) {
                }
 
                wprintf("</dt>");
-       
-
-               /* put the data here, stupid */
-               calendar_day_view_display_events(today_t, year, month, day, hour, daystart, dayend);
-
        }
 
+       gap = daystart * extratimeline;
+
+        for (hour = daystart; hour <= dayend; ++hour) {       /* could do HEIGHT=xx */
+                wprintf("<dt class=\"hour\"     "
+                        "style=\"               "
+                        "position: absolute;    "
+                        "top: %dpx; left: 0px;  "
+                        "height: %dpx;          "
+                        "\" >                   "
+                        "<a href=\"display_edit_event?msgnum=0&calview=day"
+                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+                        gap + ((hour - daystart) * timeline ), timeline,
+                        year, month, day, hour
+                );
+
+                if (time_format == WC_TIMEFORMAT_24) {
+                        wprintf("%2d:00</a> ", hour);
+                }
+                else {
+                        wprintf("%d:00%s</a> ",
+                                (hour <= 12 ? hour : hour-12),
+                                (hour < 12 ? "am" : "pm")
+                        );
+                }
+
+                wprintf("</dt>");
+        }
+
+       gap = gap + ((dayend - daystart + 1) * timeline);
+
+        for (hour = (dayend + 1); hour < 24; ++hour) {       /* could do HEIGHT=xx */
+                wprintf("<dt class=\"extrahour\"     "
+                        "style=\"               "
+                        "position: absolute;    "
+                        "top: %dpx; left: 0px;  "
+                        "height: %dpx;          "
+                        "\" >                   "
+                        "<a href=\"display_edit_event?msgnum=0&calview=day"
+                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+                        gap + ((hour - dayend - 1) * extratimeline ), extratimeline,
+                        year, month, day, hour
+                );
+
+                if (time_format == WC_TIMEFORMAT_24) {
+                        wprintf("%2d:00</a> ", hour);
+                }
+                else {
+                        wprintf("%d:00%s</a> ",
+                                (hour <= 12 ? hour : hour-12),
+                                (hour < 12 ? "am" : "pm")
+                        );
+                }
+
+                wprintf("</dt>");
+        }
+
+       /* Display events with start and end times on this day */
+       calendar_day_view_display_events(today_t, year, month, day, 0, daystart, dayend);
+
                wprintf("</dl>");
        wprintf("</td>");                       /* end of innermost table */
 
-       /** Extra events on the middle */
+       /** Display extra events (start/end times not present or not today) in the middle column */
         wprintf("<td class=\"extra_events\">");
 
         wprintf("<ul>");
 
-        /** Display all-day events) */
-                calendar_day_view_display_events(today_t, year, month, day, -1, daystart, dayend);
+        /** Display all-day events */
+       calendar_day_view_display_events(today_t, year, month, day, 1, daystart, dayend);
 
         wprintf("</ul>");
 
        wprintf("</td>");       /** end extra on the middle */
 
-       wprintf("<td width=20%% valign=top>");  /** begin stuff-on-the-right */
+       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%% "
@@ -917,7 +1225,9 @@ void calendar_day_view(int year, int month, int day) {
        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");
 
@@ -1170,7 +1480,7 @@ void do_tasks_view(void) {
                wprintf("</td>\n");
 
                due = get_task_due_date(WC->disp_cal[i].cal);
-               fmt_date(buf, due, 0);
+               webcit_fmt_date(buf, due, 0);
                wprintf("<td><font");
                if (due < time(NULL)) {
                        wprintf(" color=\"#FF0000\"");
@@ -1201,6 +1511,9 @@ void do_tasks_view(void) {
        wprintf("</i></center><br />\n");
 }
 
+/**\brief stub for non-libical builds */
+void ajax_mini_calendar(void) {
+}
 
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */