* Replaced all the "centered 99% tables" with 100% width tables wrapped

[citadel.git] / webcit / calendar_view.c

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index d89af86316f501b96ef3b8387e033f60290adeaf..0428d382bfca3cf8c73d08f3a2073f964b0ca169 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- *
+ * Handles the HTML display of calendar items.
  */
 
 #include <ctype.h>
@@ -29,11 +29,11 @@
 #ifndef WEBCIT_WITH_CALENDAR_SERVICE
 
 void do_calendar_view(void) {  /* stub for non-libical builds */
-       wprintf("<CENTER><I>Calendar view not available</I></CENTER><BR>\n");
+       wprintf("<CENTER><I>Calendar view not available</I></CENTER><br />\n");
 }
 
 void do_tasks_view(void) {     /* stub for non-libical builds */
-       wprintf("<CENTER><I>Tasks view not available</I></CENTER><BR>\n");
+       wprintf("<CENTER><I>Tasks view not available</I></CENTER><br />\n");
 }
 
 #else  /* WEBCIT_WITH_CALENDAR_SERVICE */
@@ -52,7 +52,7 @@ void calendar_month_view_display_events(time_t thetime) {
        int all_day_event = 0;
 
        if (WC->num_cal == 0) {
-               wprintf("<BR><BR><BR>\n");
+               wprintf("<br /><br /><br />\n");
                return;
        }
 
@@ -78,15 +78,6 @@ void calendar_month_view_display_events(time_t thetime) {
                                localtime_r(&event_tt, &event_tm);
                        }
 
-lprintf(9, "Event: %04d/%02d/%02d, Now: %04d/%02d/%02d\n",
-       event_tm.tm_year,
-       event_tm.tm_mon,
-       event_tm.tm_mday,
-       today_tm.tm_year,
-       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)) {
@@ -112,7 +103,7 @@ lprintf(9, "Event: %04d/%02d/%02d, Now: %04d/%02d/%02d\n",
                                        );
                                        escputs((char *)
                                                icalproperty_get_comment(p));
-                                       wprintf("</A></FONT><BR>\n");
+                                       wprintf("</A></FONT><br />\n");
 
                                        if (all_day_event) {
                                                wprintf("</TD></TR></TABLE>");
@@ -164,17 +155,11 @@ 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 style=\"margin-right:1px\">"
+               "<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><TD align=left><font color=#FFFFFF>"
-               "&nbsp;<A HREF=\"/display_edit_event?msgnum=0"
-               "&year=%d&month=%d&day=%d\">"
-               "Add new calendar event</A>"
-               "</font></TD>\n",
-               year, month, day
-       );
+       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
 
        wprintf("<TD ALIGN=CENTER>");
 
@@ -194,9 +179,7 @@ void calendar_month_view(int year, int month, int day) {
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
        wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/forward.gif\" BORDER=0></A>\n");
 
-       wprintf("</TD><TD align=right><font color=#FFFFFF size=-2>"
-               "Click on any date for day view&nbsp;"
-               "</FONT></TD></TR></TABLE>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        /* Inner table (the real one) */
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
@@ -216,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"))
@@ -225,7 +208,7 @@ void calendar_month_view(int year, int month, int day) {
                        wprintf("%s ", months[tm.tm_mon]);
                }
                wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">"
-                       "%d</A></B><BR>",
+                       "%d</A></B><br />",
                        tm.tm_year + 1900,
                        tm.tm_mon + 1,
                        tm.tm_mday,
@@ -246,12 +229,12 @@ 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");
 }
 
 
 void calendar_week_view(int year, int month, int day) {
-       wprintf("<CENTER><I>week view FIXME</I></CENTER><BR>\n");
+       wprintf("<CENTER><I>week view FIXME</I></CENTER><br />\n");
 }
 
 
@@ -269,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;
        }
 
@@ -313,7 +296,7 @@ void calendar_day_view_display_events(int year, int month,
                                        );
                                        escputs((char *)
                                                icalproperty_get_comment(p));
-                                       wprintf("</A></FONT><BR>\n");
+                                       wprintf("</A></FONT><br />\n");
 
                                        if (all_day_event) {
                                                wprintf("</TD></TR></TABLE>");
@@ -352,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 style=\"margin-right:1px\">"
+               "<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
                "bgcolor=#204B78><TR><TD>\n");
 
        /* Inner table (the real one) */
@@ -424,9 +408,9 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Today's date */
        wprintf("<TD ALIGN=CENTER>");
-       wprintf("<FONT SIZE=+2>%s</FONT><BR>"
-               "<FONT SIZE=+3>%d</FONT><BR>"
-               "<FONT SIZE=+2>%d</FONT><BR>",
+       wprintf("<FONT SIZE=+2>%s</FONT><br />"
+               "<FONT SIZE=+3>%d</FONT><br />"
+               "<FONT SIZE=+2>%d</FONT><br />",
                months[month-1], day, year);
        wprintf("</TD>");
 
@@ -441,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");
 
@@ -459,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 */
        );
 
 
@@ -515,7 +490,7 @@ void calendar_summary_view(void) {
                                if (p != NULL) {
                                        escputs((char *)
                                                icalproperty_get_comment(p));
-                                       wprintf(" (%s)<BR>\n", timestring);
+                                       wprintf(" (%s)<br />\n", timestring);
                                }
                        }
                }
@@ -639,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 style=\"margin-right:1px\">"
+               "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">\n<tr>\n"
                "<TH>Name of task</TH>\n"
                "<TH>Date due</TH></TR>\n"
        );
@@ -683,14 +657,7 @@ void do_tasks_view(void) {
                wprintf(">%s</FONT></TD></TR>\n", buf);
        }
 
-       wprintf("</TABLE>\n");
-
-       wprintf("<HR><A HREF=\"/display_edit_task?msgnum=0\">"
-               "Add new task</A>\n"
-       );
-
-       do_template("endbox");
-
+       wprintf("</table></div>\n");
 
        /* Free the list */
        free_calendar_buffer();