I began to use CSS for the calendar display

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 2f1318feec3fe4cb17027ebefc3ec23e74b704af..4deefb22c4ac59adbf4381de2f1ac569f663d844 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -355,8 +355,7 @@ void calendar_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");
+               "<table class=\"calendar\"> \n <tr><td>"); 
 
        wprintf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
 
@@ -414,17 +413,17 @@ void calendar_month_view(int year, int month, int day) {
                                wprintf("<tr>");
                        }
 
-                       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"))
+                       wprintf("<td class=\"cal%s\"><div class=\"day\">",
+                               ((tm.tm_mon != month-1) ? "out" :
+                               ((tm.tm_wday==0 || tm.tm_wday==6) ? "weekend" :
+                               "day"))
                        );
                        if ((i==0) || (tm.tm_mday == 1)) {
                                wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm);
                                wprintf("%s ", colheader_label);
                        }
                        wprintf("<a href=\"readfwd?calview=day&year=%d&month=%d&day=%d\">"
-                               "%d</a></b><br />",
+                               "%d</a></div>",
                                tm.tm_year + 1900,
                                tm.tm_mon + 1,
                                tm.tm_mday,

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 08665bd52e30c5827f9353a407562df33bd0d09d..e2a62c590218a15a0b2f038aa015067baa073418 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -400,6 +400,27 @@ var sub {
        font-style: normal;
 }
 
+.calendar {
+       background-color: #204B78;
+}
+
+.day {
+       font-weight: 700;
+}
+
+.calout {
+       background-color: #DDDDDD;
+}
+
+.calday {
+       background-color: #FFFFFF;
+}
+
+.calweekend {
+       background-color: #EEEECC;
+}
+
+
 
 /* Links */
 
@@ -1074,3 +1095,17 @@ ul.tabbed_dialog {
        width: 74%;
        padding: 10px;
 }
+
+/* Calendar view */
+
+.calendar {
+       margin: 2% auto 0 auto;
+       width: 98%;
+}
+
+.calday, .calout, .calweekend {
+       width: 14%;
+       height: 60px;
+       text-align: left;
+       vertical-align: top;
+}