Readloop remove special cases
[citadel.git] / webcit / calendar_view.c
index bee159b82f24cb79fb67d7246e21aec32c86dfc3..c8820b22c6333092e972889fc79f4bfaae8b7e6f 100644 (file)
@@ -1,7 +1,21 @@
 /*
- * $Id$
- *
  * Handles the HTML display of calendar items.
+ *
+ * Copyright (c) 1996-2011 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
@@ -26,7 +40,7 @@ void embeddable_mini_calendar(int year, int month)
        long weekstart = 0;
        char url[256];
        char div_id[256];
-       
+
        snprintf(div_id, sizeof div_id, "mini_calendar_%d", rand() );
 
        /* Determine what day to start.  If an impossible value is found, start on Sunday.
@@ -61,15 +75,15 @@ void embeddable_mini_calendar(int year, int month)
                localtime_r(&thetime, &tm);
        }
 
-       wprintf("<div class=\"mini_calendar\" id=\"%s\">\n", div_id);
+       wc_printf("<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>", 
+       wc_printf("<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;"
+       wc_printf("&nbsp;&nbsp;"
                "<span class=\"mini_calendar_month_label\">"
                "%s %d"
                "</span>"
@@ -77,20 +91,20 @@ void embeddable_mini_calendar(int year, int month)
 
        /* Next month link */
        localtime_r(&next_month, &tm);
-       wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">&raquo;</a>",
+       wc_printf("<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\">"
+       wc_printf("<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]);
+               wc_printf("<th>%c</th>", colheader_label[0]);
 
        }
-       wprintf("</tr>\n");
+       wc_printf("</tr>\n");
 
 
         /* Now do 35 or 42 days */
@@ -101,21 +115,21 @@ void embeddable_mini_calendar(int year, int month)
 
                        /* Before displaying Sunday, start a new row */
                        if ((i % 7) == 0) {
-                               wprintf("<tr>");
+                               wc_printf("<tr>");
                        }
 
                        if (tm.tm_mon == month-1) {
-                               snprintf(url, sizeof url, "readfwd?calview=day&year=%d&month=%d&day=%d", 
+                               snprintf(url, sizeof url, "readfwd?calview=day?year=%d?month=%d?day=%d",
                                        tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday);
-                               wprintf("<td><a href=\"%s\">%d</a></td>", url, tm.tm_mday);
+                               wc_printf("<td><a href=\"%s\">%d</a></td>", url, tm.tm_mday);
                        }
                        else {
-                               wprintf("<td> </td>");
+                               wc_printf("<td> </td>");
                        }
 
                        /* After displaying one week, end the row */
                        if ((i % 7) == 6) {
-                               wprintf("</tr>\n");
+                               wc_printf("</tr>\n");
                        }
 
                }
@@ -123,7 +137,7 @@ void embeddable_mini_calendar(int year, int month)
                thetime += (time_t)86400;               /* ahead 24 hours */
        }
 
-       wprintf("</table>"                      /* end of inner table */
+       wc_printf("</table>"                    /* end of inner table */
                "</div>\n");
 
        StrBufAppendPrintf(WC->trailing_javascript,
@@ -174,7 +188,7 @@ void calendar_month_view_display_events(int year, int month, int day)
        time_t tt;
 
        if (GetCount(WCC->disp_cal_items) == 0) {
-               wprintf("<br /><br /><br />\n");
+               wc_printf("<br>\n");
                return;
        }
 
@@ -245,6 +259,14 @@ void calendar_month_view_display_events(int year, int month, int day)
                 * If we determined that this event occurs today, then display it.
                 */
                if (show_event) {
+
+                       /* time_t logtt = icaltime_as_timet(t);
+                       syslog(LOG_DEBUG, "Match on %04d-%02d-%02d for event %x%s on %s",
+                               year, month, day,
+                               (int)Cal, ((all_day_event) ? " (all day)" : ""),
+                               ctime(&logtt)
+                       ); */
+
                        p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
                        if (p == NULL) {
                                p = icalproperty_new_summary(_("Untitled Event"));
@@ -253,40 +275,45 @@ void calendar_month_view_display_events(int year, int month, int day)
                        if (p != NULL) {
 
                                if (all_day_event) {
-                                       wprintf("<table border=0 cellpadding=2><TR>"
+                                       wc_printf("<table border=\"0\" cellpadding=\"2\"><TR>"
                                                "<td bgcolor=\"#CCCCDD\">"
                                                );
                                }
 
-                               wprintf("<font size=\"-1\">"
+
+                               wc_printf("<font size=\"-1\">"
                                        "<a class=\"event%s\" href=\"display_edit_event?"
-                                       "msgnum=%ld?calview=month?year=%d?month=%d?day=%d\""
-                                       " btt_tooltext=\"",
+                                       "msgnum=%ld?calview=month?year=%d?month=%d?day=%d\">"
+                                       ,
                                        (Cal->unread)?"_unread":"_read",
                                        Cal->cal_msgnum,
                                        year, month, day
-                                       );
+                               );
+
+                               escputs((char *) icalproperty_get_comment(p));
 
-                               wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
-                               wprintf("<i>%s</i> ",          _("Summary:"));
+                               wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
+
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
+                               wc_printf("<i>%s</i> ",          _("Summary:"));
                                escputs((char *)icalproperty_get_comment(p));
-                               wprintf("<br />");
-                               
+                               wc_printf("<br>");
+
                                q = icalcomponent_get_first_property(
                                        Cal->cal,
                                        ICAL_LOCATION_PROPERTY);
                                if (q) {
-                                       wprintf("<i>%s</i> ", _("Location:"));
+                                       wc_printf("<i>%s</i> ", _("Location:"));
                                        escputs((char *)icalproperty_get_comment(q));
-                                       wprintf("<br />");
+                                       wc_printf("<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(Cal->cal) == ICAL_VEVENT_COMPONENT) {
-                                       
+
                                        q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
                                        if (q != NULL) {
                                                int no_end = 0;
@@ -320,17 +347,17 @@ void calendar_month_view_display_events(int year, int month, int day)
                                                        wc_strftime(buf, sizeof buf, "%x", &d_tm);
 
                                                        if (no_end || !icaltime_compare(t, end_t)) {
-                                                               wprintf("<i>%s</i> %s<br>",
+                                                               wc_printf("<i>%s</i> %s<br>",
                                                                        _("Date:"), buf);
                                                        }
                                                        else {
-                                                               wprintf("<i>%s</i> %s<br>",
+                                                               wc_printf("<i>%s</i> %s<br>",
                                                                        _("Starting date:"), buf);
                                                                d_tm.tm_year = end_t.year - 1900;
                                                                d_tm.tm_mon = end_t.month - 1;
                                                                d_tm.tm_mday = end_t.day;
                                                                wc_strftime(buf, sizeof buf, "%x", &d_tm);
-                                                               wprintf("<i>%s</i> %s<br>",
+                                                               wc_printf("<i>%s</i> %s<br>",
                                                                        _("Ending date:"), buf);
                                                        }
                                                }
@@ -338,43 +365,41 @@ void calendar_month_view_display_events(int year, int month, int day)
                                                        tt = icaltime_as_timet(t);
                                                        webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
                                                        if (no_end || !icaltime_compare(t, end_t)) {
-                                                               wprintf("<i>%s</i> %s<br>",
+                                                               wc_printf("<i>%s</i> %s<br>",
                                                                        _("Date/time:"), buf);
                                                        }
                                                        else {
-                                                               wprintf("<i>%s</i> %s<br>",
+                                                               wc_printf("<i>%s</i> %s<br>",
                                                                        _("Starting date/time:"), buf);
                                                                tt = icaltime_as_timet(end_t);
                                                                webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
-                                                               wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+                                                               wc_printf("<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:"));
+                                       wc_printf("<i>%s</i> ", _("Notes:"));
                                        escputs((char *)icalproperty_get_comment(q));
-                                       wprintf("<br />");
+                                       wc_printf("<br>");
                                }
-                               
-                               wprintf("\">");
-                               escputs((char *)
-                                       icalproperty_get_comment(p));
-                               wprintf("</a></font><br />\n");
-                               
+
+                               wc_printf("</span><span class=\"bttbottom\"></span></span>");
+                               wc_printf("</a></font><br>\n");
+
                                if (all_day_event) {
-                                       wprintf("</td></tr></table>");
+                                       wc_printf("</td></tr></table>");
                                }
-                               
+
                        }
-                       
+
                }
-               
-               
+
+
        }
        DeleteHashPos(&Pos);
 }
@@ -399,20 +424,16 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
        icalproperty *e;
        struct icaltimetype t;
        disp_cal *Cal;
-       int month, day, year;
        int all_day_event = 0;
        char *timeformat;
        int time_format;
-       
+
        time_format = get_time_format_cached ();
 
        if (time_format == WC_TIMEFORMAT_24) timeformat="%k:%M";
        else timeformat="%I:%M %p";
 
        localtime_r(&thetime, &today_tm);
-       month = today_tm.tm_mon + 1;
-       day = today_tm.tm_mday;
-       year = today_tm.tm_year + 1900;
 
        Pos = GetNewHashPos(WCC->disp_cal_items, 0);
        while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
@@ -435,11 +456,11 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
                        if ((event_tms.tm_year == today_tm.tm_year)
                                && (event_tms.tm_mon == today_tm.tm_mon)
                        && (event_tms.tm_mday == today_tm.tm_mday)) {
-                       
-                       
+
+
                        char sbuf[255];
                        char ebuf[255];
-                       
+
                        p = icalcomponent_get_first_property(
                                Cal->cal,
                                ICAL_SUMMARY_PROPERTY);
@@ -459,36 +480,36 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
                                difftime=(event_tte-event_tts)/60;
                                hours=(int)(difftime / 60);
                                minutes=difftime % 60;
-                               wprintf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
+                               wc_printf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
                                        "<font size=\"-1\">"
                                        "<a class=\"event%s\" href=\"display_edit_event?msgnum=%ld?calview=calbrief?year=%s?month=%s?day=%s\">",
                                        daycolor,
                                        hours, minutes,
-                                       (Cal->unread)?"_unread":"_read",                                                
+                                       (Cal->unread)?"_unread":"_read",
                                        daycolor,
                                        Cal->cal_msgnum,
                                        bstr("year"),
                                        bstr("month"),
                                        bstr("day")
                                        );
-                               
+
                                escputs((char *)
                                        icalproperty_get_comment(p));
                                /* \todo: allso ammitime format */
                                wc_strftime(&sbuf[0], sizeof(sbuf), timeformat, &event_tms);
                                wc_strftime(&ebuf[0], sizeof(sbuf), timeformat, &event_tme);
-                               
-                               wprintf("</a></font></td>"
+
+                               wc_printf("</a></font></td>"
                                        "<td bgcolor='%s'>%s</td><td bgcolor='%s'>%s</td></tr>",
                                        daycolor,
                                        sbuf,
                                        daycolor,
                                        ebuf);
                                }
-                       
+
                        }
-                       
-                       
+
+
                }
        }
        DeleteHashPos(&Pos);
@@ -501,15 +522,23 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
 void calendar_month_view(int year, int month, int day) {
        struct tm starting_tm;
        struct tm tm;
+       struct tm today_tm;
        time_t thetime;
        int i;
        time_t previous_month;
        time_t next_month;
        time_t colheader_time;
+       time_t today_timet;
        struct tm colheader_tm;
        char colheader_label[32];
        long weekstart = 0;
 
+       /*
+        * Make sure we know which day is today.
+        */
+       today_timet = time(NULL);
+       localtime_r(&today_timet, &today_tm);
+
        /*
         * Determine what day to start.  If an impossible value is found, start on Sunday.
         */
@@ -544,45 +573,45 @@ void calendar_month_view(int year, int month, int day) {
        }
 
        /* Outer table (to get the background color) */
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"calendar\"> \n <tr><td>"); 
+       wc_printf("<table class=\"calendar\"> \n <tr><td>"); 
 
-       wprintf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n");
 
-       wprintf("<td align=center>");
+       wc_printf("<td align=\"center\">");
 
        localtime_r(&previous_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
+       wc_printf("<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_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
        wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
-       wprintf("&nbsp;&nbsp;"
-               "<font size=+1 color=\"#FFFFFF\">"
+       wc_printf("&nbsp;&nbsp;"
+               "<font size=\"+1\" color=\"#FFFFFF\">"
                "%s %d"
                "</font>"
                "&nbsp;&nbsp;", colheader_label, year);
 
        localtime_r(&next_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
+       wc_printf("<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");
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></A>\n", _("next"));
 
-       wprintf("</td></tr></table>\n");
+       wc_printf("</td></tr></table>\n");
 
        /* Inner table (the real one) */
-       wprintf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#204B78 id=\"inner_month\"><tr>");
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\" "
+               "bgcolor='#204B78' id=\"inner_month\"><tr>");
+       wc_printf("<th align=\"center\" width=\"2%%\"></th>");
        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 align=center width=14%%>"
+               wc_printf("<th align=\"center\" width=\"14%%\">"
                        "<font color=\"#FFFFFF\">%s</font></th>", colheader_label);
 
        }
-       wprintf("</tr>\n");
+       wc_printf("</tr>\n");
 
 
         /* Now do 35 or 42 days */
@@ -591,20 +620,22 @@ void calendar_month_view(int year, int month, int day) {
 
                /* Before displaying the first day of the week, start a new row */
                if ((i % 7) == 0) {
-                       wprintf("<tr>");
+                       wc_printf("<tr><td class=\"week_of_year\">");
+                       wc_strftime(colheader_label, sizeof colheader_label, "%V", &tm);
+                        wc_printf("%s ", colheader_label);
                }
 
-               wprintf("<td class=\"cal%s\"><div class=\"day\">",
+               wc_printf("<td class=\"cal%s\"><div class=\"day\">",
                        ((tm.tm_mon != month-1) ? "out" :
-                               ((tm.tm_mday == day) ? "today" :
+                               (((tm.tm_year == today_tm.tm_year) && (tm.tm_mon == today_tm.tm_mon) && (tm.tm_mday == today_tm.tm_mday)) ? "today" :
                                ((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);
+                       wc_printf("%s ", colheader_label);
                }
-               wprintf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">"
+               wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">"
                        "%d</a></div>",
                        tm.tm_year + 1900,
                        tm.tm_mon + 1,
@@ -618,11 +649,11 @@ void calendar_month_view(int year, int month, int day) {
                        tm.tm_mday
                        );
 
-               wprintf("</td>");
+               wc_printf("</td>");
 
                /* After displaying the last day of the week, end the row */
                if ((i % 7) == 6) {
-                       wprintf("</tr>\n");
+                       wc_printf("</tr>\n");
                }
 
                thetime += (time_t)86400;               /* ahead 24 hours */
@@ -633,23 +664,8 @@ void calendar_month_view(int year, int month, int day) {
                }
        }
 
-       wprintf("</table>"                      /* end of inner table */
-               "</td></tr></table>"            /* end of outer table */
-               "</div>\n");
-
-       /*
-        * Initialize the bubble tooltips.
-        *
-        * Yes, this is as stupid as it looks.  Instead of just making the call
-        * to btt_enableTooltips() straight away, we have to create a timer event
-        * and let it initialize as an event after 1 millisecond.  This is to
-        * work around a bug in Internet Explorer that causes it to crash if we
-        * manipulate the innerHTML of various DOM nodes while the page is still
-        * being rendered.  See http://www.shaftek.org/blog/archives/000212.html
-        * for more information.
-        */ 
-       StrBufAppendPrintf(WC->trailing_javascript,
-               " setTimeout(\"btt_enableTooltips('inner_month')\", 1); \n"
+       wc_printf("</table>"                    /* end of inner table */
+               "</td></tr></table>\n"          /* end of outer table */
        );
 }
 
@@ -692,38 +708,37 @@ void calendar_brief_month_view(int year, int month, int day) {
        }
 
        /* 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");
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" "
+               "bgcolor=#204B78><tr><td>\n");
 
-       wprintf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n");
 
-       wprintf("<td align=center>");
+       wc_printf("<td align=\"center\">");
 
        localtime_r(&previous_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
+       wc_printf("<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_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
        wc_strftime(month_label, sizeof month_label, "%B", &tm);
-       wprintf("&nbsp;&nbsp;"
-               "<font size=+1 color=\"#FFFFFF\">"
+       wc_printf("&nbsp;&nbsp;"
+               "<font size=\"+1\" color=\"#FFFFFF\">"
                "%s %d"
                "</font>"
                "&nbsp;&nbsp;", month_label, year);
 
        localtime_r(&next_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
+       wc_printf("<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");
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></a>\n", _("next"));
 
-       wprintf("</td></tr></table>\n");
+       wc_printf("</td></tr></table>\n");
 
        /* Inner table (the real one) */
-       wprintf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\" "
                "bgcolor=#EEEECC><TR>");
-       wprintf("</tr>\n");
-       wprintf("<tr><td colspan=\"100%%\">\n");
+       wc_printf("</tr>\n");
+       wc_printf("<tr><td colspan=\"100%%\">\n");
 
        /* Now do 35 days */
        for (i = 0; i < 35; ++i) {
@@ -736,9 +751,9 @@ void calendar_brief_month_view(int year, int month, int day) {
                /* Before displaying Sunday, start a new CELL */
                if ((i % 7) == 0) {
                        wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm);
-                       wprintf("<table border='0' bgcolor=\"#EEEECC\" width='100%%'> <tr><th colspan='4'>%s %s</th></tr>"
-                               "   <tr><td>%s</td><td width=70%%>%s</td><td>%s</td><td>%s</td></tr>\n",
-                               _("Week"), 
+                       wc_printf("<table border='0' bgcolor=\"#EEEECC\" width='100%%'> <tr><th colspan='4'>%s %s</th></tr>"
+                               "   <tr><td>%s</td><td width='70%%'>%s</td><td>%s</td><td>%s</td></tr>\n",
+                               _("Week"),
                                weeknumber,
                                _("Hours"),
                                _("Subject"),
@@ -746,14 +761,14 @@ void calendar_brief_month_view(int year, int month, int day) {
                                _("End")
                                );
                }
-               
+
                daycolor=((tm.tm_mon != month-1) ? "DDDDDD" :
                        ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" :
                                "FFFFFF"));
-               
+
                /* Day Header */
                wc_strftime(weekday_name, sizeof weekday_name, "%A", &tm);
-               wprintf("<tr><td bgcolor='%s' colspan='1' align='left'> %s,%i."
+               wc_printf("<tr><td bgcolor='%s' colspan='1' align='left'> %s,%i."
                        "</td><td bgcolor='%s' colspan='3'><hr></td></tr>\n",
                        daycolor,
                        weekday_name,tm.tm_mday,
@@ -765,22 +780,22 @@ void calendar_brief_month_view(int year, int month, int day) {
 
                /* After displaying Saturday, end the row */
                if ((i % 7) == 6) {
-                       wprintf("</td></tr></table>\n");
+                       wc_printf("</td></tr></table>\n");
                }
 
                thetime += (time_t)86400;               /* ahead 24 hours */
        }
 
-       wprintf("</table>"                      /* end of inner table */
-               "</td></tr></table>"            /* end of outer table */
-               "</div>\n");
+       wc_printf("</table>"                    /* end of inner table */
+               "</td></tr></table>\n"          /* end of outer table */
+       );
 }
 
 /*
  * Calendar week view -- not implemented yet, this is a stub function
  */
 void calendar_week_view(int year, int month, int day) {
-       wprintf("<center><i>week view FIXME</i></center><br />\n");
+       wc_printf("<center><i>week view FIXME</i></center><br>\n");
 }
 
 
@@ -929,81 +944,85 @@ void calendar_day_view_display_events(time_t thetime,
 
                        if (all_day_event && notime_events)
                        {
-                               wprintf("<li class=\"event_framed%s\"> "
+                               wc_printf("<li class=\"event_framed%s\"> "
                                        "<a href=\"display_edit_event?"
                                        "msgnum=%ld?calview=day?year=%d?month=%d?day=%d\" "
-                                       " class=\"event_title\" "
-                                       " btt_tooltext=\"",
+                                       " class=\"event_title\">"
+                                       ,
                                        (Cal->unread)?"_unread":"_read",
-                                        Cal->cal_msgnum, year, month, day);
-                                wprintf("<i>%s</i><br />",      _("All day event"));
-                               wprintf("<i>%s: %s</i><br />",  _("From"), Cal->from);
-                                wprintf("<i>%s</i> ",           _("Summary:"));
+                                        Cal->cal_msgnum, year, month, day
+                               );
+                                escputs((char *) icalproperty_get_comment(p));
+                               wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
+                                wc_printf("<i>%s</i><br>",      _("All day event"));
+                               wc_printf("<i>%s: %s</i><br>",  _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",           _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wprintf("<br />");
+                                wc_printf("<br>");
                                q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br>");
                                }
                                if (!icaltime_compare(t, end_t)) { /* one day only */
                                        webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
-                                       wprintf("<i>%s</i> %s<br>", _("Date:"), buf);
+                                       wc_printf("<i>%s</i> %s<br>", _("Date:"), buf);
                                }
                                else {
                                        webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
-                                       wprintf("<i>%s</i> %s<br>", _("Starting date:"), buf);
+                                       wc_printf("<i>%s</i> %s<br>", _("Starting date:"), buf);
                                        webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE);
-                                       wprintf("<i>%s</i> %s<br>", _("Ending date:"), buf);
+                                       wc_printf("<i>%s</i> %s<br>", _("Ending date:"), buf);
                                }
                                q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Notes:"));
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br>");
                                 }
-                                wprintf("\">");
-                                escputs((char *) icalproperty_get_comment(p));
-                                wprintf("</a> <span>(");
-                                wprintf(_("All day event"));
-                                wprintf(")</span></li>\n");
+                               wc_printf("</span><span class=\"bttbottom\"></span></span>");
+                                wc_printf("</a> <span>(");
+                                wc_printf(_("All day event"));
+                                wc_printf(")</span></li>\n");
                        }
                        else if (ongoing_event && notime_events) 
                        {
-                               wprintf("<li class=\"event_framed%s\"> "
+                               wc_printf("<li class=\"event_framed%s\"> "
                                        "<a href=\"display_edit_event?"
                                        "msgnum=%ld&calview=day?year=%d?month=%d?day=%d\" "
-                                       " class=\"event_title\" 
-                                       "btt_tooltext=\"",
+                                       " class=\"event_title\">
+                                       ,
                                        (Cal->unread)?"_unread":"_read",
-                                       Cal->cal_msgnum, year, month, day);
-                                wprintf("<i>%s</i><br />",     _("Ongoing event"));
-                               wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
-                                wprintf("<i>%s</i> ",          _("Summary:"));
+                                       Cal->cal_msgnum, year, month, day
+                               );
+                               escputs((char *) icalproperty_get_comment(p));
+                               wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
+                                wc_printf("<i>%s</i><br>",     _("Ongoing event"));
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wprintf("<br />");
+                                wc_printf("<br>");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br>");
                                                                }
                                 webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
-                                wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+                                wc_printf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
                                 webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
-                                wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+                                wc_printf("<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:"));
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br>");
                                 }
-                                wprintf("\">");
-                               escputs((char *) icalproperty_get_comment(p));
-                               wprintf("</a> <span>(");
-                               wprintf(_("Ongoing event"));
-                               wprintf(")</span></li>\n");
+                                wc_printf("</span><span class=\"bttbottom\"></span></span>");
+                               wc_printf("</a> <span>(");
+                               wc_printf(_("Ongoing event"));
+                               wc_printf(")</span></li>\n");
                        }
                        else if (!all_day_event && !notime_events)
                        {
@@ -1046,48 +1065,49 @@ void calendar_day_view_display_events(time_t thetime,
                                        /* should never get here */
                                }
 
-                               wprintf("<dd  class=\"event_framed%s\" "
+                               wc_printf("<dd  class=\"event_framed%s\" "
                                        "style=\"position: absolute; "
                                        "top:%dpx; left:%dpx; "
                                        "height:%dpx; \" >",
                                        (Cal->unread)?"_unread":"_read",
                                        top, (gap * 40), (bottom-top)
                                        );
-                               wprintf("<a href=\"display_edit_event?"
+                               wc_printf("<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: %s</i><br />", _("From"), Cal->from);
-                                wprintf("<i>%s</i> ",          _("Summary:"));
+                                       "class=\"event_title\">"
+                                       ,
+                                       Cal->cal_msgnum, year, month, day, t.hour
+                               );
+                               escputs((char *) icalproperty_get_comment(p));
+                               wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wprintf("<br />");
+                                wc_printf("<br>");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
-                                        wprintf("<i>%s</i> ", _("Location:"));
+                                        wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br>");
                                                                }
                                if (!icaltime_compare(t, end_t)) { /* one day only */
                                        webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
-                                       wprintf("<i>%s</i> %s<br>", _("Date/time:"), buf);
+                                       wc_printf("<i>%s</i> %s<br>", _("Date/time:"), buf);
                                }
                                else {
                                        webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
-                                       wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+                                       wc_printf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
                                        webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
-                                       wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+                                       wc_printf("<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:"));
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wprintf("<br />");
+                                        wc_printf("<br>");
                                 }
-                                wprintf("\">");
-
-                               escputs((char *) icalproperty_get_comment(p));
-                               wprintf("</a></dd>\n");
+                               wc_printf("</span><span class=\"bttbottom\"></span></span>");
+                               wc_printf("</a></dd>\n");
                        }
                }
        }
@@ -1103,7 +1123,7 @@ void calendar_day_view(int year, int month, int day) {
        long daystart;
        long dayend;
        struct tm d_tm;
-       char d_str[128];
+       char d_str[160];
        int time_format;
        time_t today_t;
        int timeline = TIMELINE;
@@ -1121,7 +1141,7 @@ void calendar_day_view(int year, int month, int day) {
                daystart = 9;
                dayend = 17;
        }
-       
+
        /* Today's date */
        memset(&d_tm, 0, sizeof d_tm);
        d_tm.tm_year = year - 1900;
@@ -1145,14 +1165,12 @@ void calendar_day_view(int year, int month, int day) {
        ++tomorrow.day;
        tomorrow = icaltime_normalize(tomorrow);
 
-       wprintf("<div class=\"fix_scrollbar_bug\">");
-
        /* Inner table (the real one) */
-       wprintf("<table class=\"calendar\" id=\"inner_day\"><tr> \n");
+       wc_printf("<table class=\"calendar\" id=\"inner_day\"><tr> \n");
 
        /* Innermost cell (contains hours etc.) */
-       wprintf("<td class=\"events_of_the_day\" >");
-               wprintf("<dl class=\"events\" >");
+       wc_printf("<td class=\"events_of_the_day\" >");
+               wc_printf("<dl class=\"events\" >");
 
        /* Now the middle of the day... */
 
@@ -1161,163 +1179,144 @@ void calendar_day_view(int year, int month, int day) {
        if (hourlabel > (timeline - 2)) hourlabel = timeline - 2;
 
        for (hour = 0; hour < daystart; ++hour) {       /* could do HEIGHT=xx */
-               wprintf("<dt class=\"extrahour\"        "
-                       "style=\"               "
-                       "position: absolute;    "
-                       "top: %dpx; left: 0px;  "
-                       "height: %dpx;          "
-                       "font-size: %dpx;       "
-                       "\" >                   "
+               wc_printf("<dt class=\"extrahour\">"
                        "<a href=\"display_edit_event?msgnum=0"
                        "?calview=day?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/* TODO: what have these been used for?
                        (hour * extratimeline ),
                        extratimeline,
                        extrahourlabel,
+*/
                        year, month, day, hour
                        );
 
                if (time_format == WC_TIMEFORMAT_24) {
-                       wprintf("%2d:00</a> ", hour);
+                       wc_printf("%2d:00</a> ", hour);
                }
                else {
-                       wprintf("%d:00%s</a> ",
+                       wc_printf("%d:00%s</a> ",
                                ((hour == 0) ? 12 : (hour <= 12 ? hour : hour-12)),
                                (hour < 12 ? "am" : "pm")
                                );
                }
 
-               wprintf("</dt>");
+               wc_printf("</dt>");
        }
 
        gap = daystart * extratimeline;
 
         for (hour = daystart; hour <= dayend; ++hour) {       /* could do HEIGHT=xx */
-                wprintf("<dt class=\"hour\"     "
-                        "style=\"               "
-                        "position: absolute;    "
-                        "top: %ldpx; left: 0px; "
-                        "height: %dpx;          "
-                       "font-size: %dpx;       "
-                        "\" >                   "
+                wc_printf("<dt class=\"hour\">"
                         "<a href=\"display_edit_event?msgnum=0?calview=day"
                         "?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/*TODO: what have these been used for?
                         gap + ((hour - daystart) * timeline ),
                        timeline,
                        hourlabel,
+*/
                         year, month, day, hour
                        );
 
                 if (time_format == WC_TIMEFORMAT_24) {
-                        wprintf("%2d:00</a> ", hour);
+                        wc_printf("%2d:00</a> ", hour);
                 }
                 else {
-                        wprintf("%d:00%s</a> ",
+                        wc_printf("%d:00%s</a> ",
                                 (hour <= 12 ? hour : hour-12),
                                 (hour < 12 ? "am" : "pm")
                                                );
                 }
 
-                wprintf("</dt>");
+                wc_printf("</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: %ldpx; left: 0px; "
-                        "height: %dpx;          "
-                       "font-size: %dpx;       "
-                        "\" >                   "
+                wc_printf("<dt class=\"extrahour\">"
                         "<a href=\"display_edit_event?msgnum=0?calview=day"
                         "?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/*TODO: what have these been used for?
                         gap + ((hour - dayend - 1) * extratimeline ),
                        extratimeline,
                        extrahourlabel,
+*/
                         year, month, day, hour
                 );
 
                 if (time_format == WC_TIMEFORMAT_24) {
-                        wprintf("%2d:00</a> ", hour);
+                        wc_printf("%2d:00</a> ", hour);
                 }
                 else {
-                        wprintf("%d:00%s</a> ",
+                        wc_printf("%d:00%s</a> ",
                                 (hour <= 12 ? hour : hour-12),
                                 (hour < 12 ? "am" : "pm")
                         );
                 }
 
-                wprintf("</dt>");
+                wc_printf("</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 */
+               wc_printf("</dl>");
+       wc_printf("</td>");                     /* end of innermost table */
 
        /* Display extra events (start/end times not present or not today) in the middle column */
-        wprintf("<td class=\"extra_events\">");
+        wc_printf("<td class=\"extra_events\">");
 
-        wprintf("<ul>");
+        wc_printf("<ul>");
 
         /* Display all-day events */
        calendar_day_view_display_events(today_t, year, month, day, 1, daystart, dayend);
 
-        wprintf("</ul>");
+        wc_printf("</ul>");
 
-       wprintf("</td>");       /* end extra on the middle */
+       wc_printf("</td>");     /* end extra on the middle */
 
-       wprintf("<td width=20%% align=center valign=top>");     /* begin stuff-on-the-right */
+       wc_printf("<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%% "
-               "cellspacing=0 cellpadding=0 bgcolor=\"#FFFFFF\">\n");
-       wprintf("<tr>");
+       wc_printf("<table border=\"0\" width=\"100%%\" "
+               "cellspacing=\"0\" cellpadding=\"0\" bgcolor=\"#FFFFFF\">\n");
+       wc_printf("<tr>");
 
-       /* Left arrow */        
-       wprintf("<td align=center>");
-       wprintf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
+       /* Left arrow */
+       wc_printf("<td align=\"center\">");
+       wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
                yesterday.year, yesterday.month, yesterday.day);
-       wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>");
-       wprintf("</td>");
+       wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>");
+       wc_printf("</td>");
 
        wc_strftime(d_str, sizeof d_str,
-               "<td align=center>"
-               "<font size=+2>%B</font><br />"
-               "<font size=+3>%d</font><br />"
-               "<font size=+2>%Y</font><br />"
+               "<td align=\"center\">"
+               "<font size='+2'>%A</font><br>"
+               "<font size='+2'>%B</font><br>"
+               "<font size='+3'>%d</font><br>"
+               "<font size='+2'>%Y</font><br>"
                "</td>",
                &d_tm
                );
-       wprintf("%s", d_str);
+       wc_printf("%s", d_str);
 
        /* Right arrow */
-       wprintf("<td align=center>");
-       wprintf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
+       wc_printf("<td align=\"center\">");
+       wc_printf("<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");
-       wprintf("</td>");
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\""
+               " border=\"0\"></a>\n", _("next"));
+       wc_printf("</td>");
 
-       wprintf("</tr></table>\n");
+       wc_printf("</tr></table>\n");
        /* End todays-date-with-left-and-right-arrows */
 
        /* Embed a mini month calendar in this space */
-       wprintf("<br />\n");
+       wc_printf("<br>\n");
        embeddable_mini_calendar(year, month);
 
-       wprintf("</font></center>\n");
-
-       wprintf("</td></tr>");                  /* end stuff-on-the-right */
-
-       wprintf("</table>"                      /* end of inner table */
-               "</div>");
-
-       StrBufAppendPrintf(WC->trailing_javascript,
-                " setTimeout(\"btt_enableTooltips('inner_day')\", 1);  \n"
-        );
+       wc_printf("</td></tr>");                        /* end stuff-on-the-right */
+       wc_printf("</table>\n");                        /* end of inner table */
 }
 
 
@@ -1380,40 +1379,39 @@ int calendar_summary_view(void) {
                                        p = icalproperty_new_summary(_("Untitled Task"));
                                        icalcomponent_add_property(Cal->cal, p);
                                }
-                               if (p != NULL) {
-
-
-                                       if (WCC->wc_view == VIEW_TASKS) {
-                                               wprintf("<a href=\"display_edit_task"
+                               if (p != NULL)
+                               {
+                                       if (WCC->CurRoom.view == VIEW_TASKS) {
+                                               wc_printf("<a href=\"display_edit_task"
                                                        "?msgnum=%ld"
                                                        "?return_to_summary=1"
-                                                       "?gotofirst=",
+                                                       "?go=",
                                                        Cal->cal_msgnum
                                                );
-                                               escputs(ChrPtr(WCC->wc_roomname));
-                                               wprintf("\">");
+                                               escputs(ChrPtr(WCC->CurRoom.name));
+                                               wc_printf("\">");
                                        }
                                        else {
-                                               wprintf("<a href=\"display_edit_event"
+                                               wc_printf("<a href=\"display_edit_event"
                                                        "?msgnum=%ld"
                                                        "?calview=summary"
                                                        "?year=%d"
                                                        "?month=%d"
                                                        "?day=%d"
-                                                       "?gotofirst=",
+                                                       "?go=",
                                                        Cal->cal_msgnum,
                                                        today_tm.tm_year + 1900,
                                                        today_tm.tm_mon + 1,
                                                        today_tm.tm_mday
                                                );
-                                               escputs(ChrPtr(WCC->wc_roomname));
-                                               wprintf("\">");
+                                               escputs(ChrPtr(WCC->CurRoom.name));
+                                               wc_printf("\">");
                                        }
                                        escputs((char *) icalproperty_get_comment(p));
                                        if (!all_day_event) {
-                                               wprintf(" (%s)", timestring);
+                                               wc_printf(" (%s)", timestring);
                                        }
-                                       wprintf("</a><br />\n");
+                                       wc_printf("</a><br>\n");
                                        ++num_displayed;
                                }
                        }
@@ -1427,12 +1425,15 @@ int calendar_summary_view(void) {
 /*
  * Parse the URL variables in order to determine the scope and display of a calendar view
  */
-int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, 
-                                   void **ViewSpecific, 
-                                   long oper, 
-                                   char *cmd, 
-                                   long len)
+int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
+                                   void **ViewSpecific,
+                                   long oper,
+                                   char *cmd,
+                                   long len,
+                                   char *filter,
+                                   long flen)
 {
+       wcsession *WCC = WC;
        calview *c;
        time_t now;
        struct tm tm;
@@ -1447,7 +1448,7 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
        Stat->load_seen = 1;
        strcpy(cmd, "MSGS ALL");
        Stat->maxmsgs = 32767;
-       
+
        /* In case no date was specified, go with today */
        now = time(NULL);
        localtime_r(&now, &tm);
@@ -1479,7 +1480,7 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
                c->view = calview_day;
        }
        else {
-               if (WC->wc_view == VIEW_CALBRIEF) {
+               if (WCC->CurRoom.view == VIEW_CALBRIEF) {
                        c->view = calview_brief;
                }
                else {
@@ -1512,10 +1513,11 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
 /*
  * Render a calendar view from data previously loaded into memory
  */
-int calendar_RenderView_or_Tail(SharedMessageStatus *Stat, 
-                               void **ViewSpecific, 
+int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
+                               void **ViewSpecific,
                                long oper)
 {
+       wcsession *WCC = WC;
        calview *c = (calview*) *ViewSpecific;
 
        if (c->view == calview_day) {
@@ -1525,7 +1527,7 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
                calendar_week_view(c->year, c->month, c->day);
        }
        else {
-               if (WC->wc_view == VIEW_CALBRIEF) {
+               if (WCC->CurRoom.view == VIEW_CALBRIEF) {
                        calendar_brief_month_view(c->year, c->month, c->day);
                }
                else {
@@ -1538,7 +1540,9 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
        return 0;
 }
 
-
-
-
-
+void 
+InitModule_CALENDAR_VIEW
+(void)
+{
+       WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
+}