* The previous <div style=\"margin-right:1px\"> has been replaced by a

[citadel.git] / webcit / calendar_view.c

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 834a4d3b5cdf820266d93919384b8898df656e81..b180909003e55fa95101070303b77e4bc36fbd7c 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -78,14 +78,6 @@ void calendar_month_view_display_events(time_t thetime) {
                                localtime_r(&event_tt, &event_tm);
                        }
 
-lprintf(9, "Event: %04d-%s-%02d, Now: %04d-%s-%02d\n",
-       event_tm.tm_year + 1900,
-       ascmonths[event_tm.tm_mon],
-       event_tm.tm_mday,
-       today_tm.tm_year + 1900,
-       ascmonths[today_tm.tm_mon],
-       today_tm.tm_mday);
-
                        if ((event_tm.tm_year == today_tm.tm_year)
                           && (event_tm.tm_mon == today_tm.tm_mon)
                           && (event_tm.tm_mday == today_tm.tm_mday)) {
@@ -163,7 +155,8 @@ void calendar_month_view(int year, int month, int day) {
        }
 
        /* Outer table (to get the background color) */
-       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<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");
@@ -206,7 +199,7 @@ void calendar_month_view(int year, int month, int day) {
                        wprintf("<TR>");
                }
 
-               wprintf("<TD BGCOLOR=\"#%s\" WIDTH=14%% HEIGHT=60 VALIGN=TOP><B>",
+               wprintf("<TD BGCOLOR=\"#%s\" WIDTH=14%% HEIGHT=60 align=left VALIGN=TOP><B>",
                        ((tm.tm_mon != month-1) ? "DDDDDD" :
                        ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" :
                        "FFFFFF"))
@@ -236,7 +229,7 @@ void calendar_month_view(int year, int month, int day) {
 
        wprintf("</TABLE>"                      /* end of inner table */
                "</TD></TR></TABLE>"            /* end of outer table */
-               "</CENTER>\n");
+               "</div>\n");
 }
 
 
@@ -259,7 +252,7 @@ void calendar_day_view_display_events(int year, int month,
        int all_day_event = 0;
 
        if (WC->num_cal == 0) {
-               wprintf("<br /><br /><br />\n");
+               // FIXME wprintf("<br /><br /><br />\n");
                return;
        }
 
@@ -342,7 +335,8 @@ void calendar_day_view(int year, int month, int day) {
 
 
        /* Outer table (to get the background color) */
-       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
                "bgcolor=#204B78><TR><TD>\n");
 
        /* Inner table (the real one) */
@@ -431,16 +425,7 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("</TR></TABLE>\n");
        /* End todays-date-with-left-and-right-arrows */
 
-       wprintf("<br /><br /><CENTER><font color=#FFFFFF>"
-               "&nbsp;<A HREF=\"/display_edit_event?msgnum=0"
-               "&year=%d&month=%d&day=%d\">"
-               "Add new calendar event</A>"
-               "<br /><br />\n",
-               year, month, day
-       );
-
-       wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">"
-               "Back to month view</A>\n", year, month);
+       /* In the future we might want to put a month-o-matic here */
 
        wprintf("</FONT></CENTER>\n");
 
@@ -449,7 +434,7 @@ void calendar_day_view(int year, int month, int day) {
 
 
        wprintf("</TR></TABLE>"                 /* end of inner table */
-               "</TD></TR></TABLE>"            /* end of outer table */
+               "</TD></TR></TABLE></div>"      /* end of outer table */
        );
 
 
@@ -629,9 +614,8 @@ void do_tasks_view(void) {
        char buf[SIZ];
        icalproperty *p;
 
-       do_template("beginbox_nt");
-
-       wprintf("<TABLE BORDER=0 CELLSPACING=0 WIDTH=100%%>\n<TR>\n"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">\n<tr>\n"
                "<TH>Name of task</TH>\n"
                "<TH>Date due</TH></TR>\n"
        );
@@ -673,10 +657,7 @@ void do_tasks_view(void) {
                wprintf(">%s</FONT></TD></TR>\n", buf);
        }
 
-       wprintf("</TABLE>\n");
-
-       do_template("endbox");
-
+       wprintf("</table></div>\n");
 
        /* Free the list */
        free_calendar_buffer();