* Make the "all day event" shadebox smaller (month view) - no border.

* Fixed bug that caused any events following an all day event to also appear
  with the shadebox.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 74ccdba1282423beaadfac04b6bc207aaf3af478..eaaa3478812af70eeeea671cecb4e0743815f363 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 400.53  2002/11/16 23:15:02  ajc
+* Make the "all day event" shadebox smaller (month view) - no border.
+* Fixed bug that caused any events following an all day event to also appear
+  with the shadebox.
+
 Revision 400.52  2002/11/16 05:40:54  ajc
 * When adding new events to the calendar, default to the month [and day]
   currently being viewed.
@@ -1126,3 +1131,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/calendar.c b/webcit/calendar.c
index c95b02e1013f373551ff48a205f955bc95a562bb..2f903ec340bc89879b91228df0e347f76e9010ab 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -148,11 +148,23 @@ void cal_process_object(icalcomponent *cal,
                                                ICAL_DTSTART_PROPERTY);
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
-                       tt = icaltime_as_timet(t);
-                       fmt_date(buf, tt);
-                       wprintf("<TR><TD><B>Starting date/time:</B></TD><TD>"
-                               "%s</TD></TR>", buf
-                       );
+
+                       if (t.is_date) {
+                               wprintf("<TR><TD><B>Date:"
+                                       "</B></TD><TD>"
+                                       "%s %d, %d</TD></TR>",
+                                       months[t.month - 1],
+                                       t.day, t.year
+                               );
+                       }
+                       else {
+                               tt = icaltime_as_timet(t);
+                               fmt_date(buf, tt);
+                               wprintf("<TR><TD><B>Starting date/time:"
+                                       "</B></TD><TD>"
+                                       "%s</TD></TR>", buf
+                               );
+                       }
                }
        
                p = icalcomponent_get_first_property(cal, ICAL_DTEND_PROPERTY);

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 56005f92cdfb57bbfb086ab5fba229a33cf90561..12c28ec65fe6002de50cb7d9d7b8eb64321947d7 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -66,6 +66,7 @@ void calendar_month_view_display_events(time_t thetime) {
                           && (t.day == day)) {
 
                                if (t.is_date) all_day_event = 1;
+                               else all_day_event = 0;
 
                                p = icalcomponent_get_first_property(
                                                        WC->disp_cal[i],
@@ -73,8 +74,8 @@ void calendar_month_view_display_events(time_t thetime) {
                                if (p != NULL) {
 
                                        if (all_day_event) {
-                                               wprintf("<TABLE border=1 cellpadding=2><TR>"
-                                                       "<TD BGCOLOR=#CCCCCC>"
+                                               wprintf("<TABLE border=0 cellpadding=2><TR>"
+                                                       "<TD BGCOLOR=#AAAAAA>"
                                                );
                                        }