* Prettied up the calendar day view layout

* Hour/minute editing fields now use am/pm hours and 2-digit minutes

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 70f6194d572ce8c680240cd6ab21fb0734c5e4db..f6fcfef259ee91911ff6b7ad9101d78c0091ccfb 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 400.65  2002/12/17 05:01:39  ajc
+* Prettied up the calendar day view layout
+* Hour/minute editing fields now use am/pm hours and 2-digit minutes
+
 Revision 400.64  2002/12/16 04:43:30  ajc
 * Correctly handle local time zone when figuring out which day and time to
   display events on calendar month/day views.  This also seems to have
@@ -1173,3 +1177,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_tools.c b/webcit/calendar_tools.c
index 7ece52fda877a5f9f11438d67d122b273a486c98..1753a483c96bf3c5e28818581577a987f538bc14 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -36,6 +36,13 @@ char *days[] = {
        "Thursday", "Friday", "Saturday"
 };
 
+char *hourname[] = {
+       "12am", "1am", "2am", "3am", "4am", "5am", "6am",
+       "7am", "8am", "9am", "10am", "11am", "12pm",
+       "1pm", "2pm", "3pm", "4pm", "5pm", "6pm",
+       "7pm", "8pm", "9pm", "10pm", "11pm"
+};
+
 #ifdef HAVE_ICAL_H
 
 /*
@@ -118,9 +125,9 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) {
        wprintf("Hour: ");
        wprintf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
        for (i=0; i<=23; ++i) {
-               wprintf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
+               wprintf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
                        ((tm->tm_hour == i) ? "SELECTED" : ""),
-                       i, i
+                       i, hourname[i]
                );
        }
        wprintf("</SELECT>\n");
@@ -128,7 +135,7 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) {
        wprintf("Minute: ");
        wprintf("<SELECT NAME=\"%s_minute\" SIZE=\"1\">\n", prefix);
        for (i=0; i<=59; ++i) {
-               wprintf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
+               wprintf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
                        ((tm->tm_min == i) ? "SELECTED" : ""),
                        i, i
                );

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index b70faa337ffde6c10a2166c7cb0381ae0d33cd39..02c9f5ecb784ab02c57808e17dd0637205d8ff2e 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -79,7 +79,7 @@ void calendar_month_view_display_events(time_t thetime) {
 
                                        if (all_day_event) {
                                                wprintf("<TABLE border=0 cellpadding=2><TR>"
-                                                       "<TD BGCOLOR=#AAAAAA>"
+                                                       "<TD BGCOLOR=#CCCCDD>"
                                                );
                                        }
 
@@ -328,47 +328,14 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
                "bgcolor=#4444FF><TR>\n");
 
-       wprintf("<TD WIDTH=50%% VALIGN=top>");  /* begin stuff-on-the-left */
-
-       wprintf("<CENTER><H3>");
-       wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
-               yesterday.year, yesterday.month, yesterday.day
-       );
-       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>\n");
-       wprintf("&nbsp;&nbsp;<FONT COLOR=#FFFFFF>"
-               "%s %d, %d"
-               "</FONT>&nbsp;&nbsp;",
-               months[month-1], day, year);
-       wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
-               tomorrow.year, tomorrow.month, tomorrow.day
-       );
-       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/forward.gif\""
-               " BORDER=0></A>\n");
-       wprintf("</H3></CENTER>\n");
-
-       wprintf("<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);
-
-       wprintf("</FONT></CENTER>\n");
-
-       wprintf("</TD>");                       /* end stuff-on-the-left */
-
        /* Innermost table (contains hours etc.) */
-       wprintf("<TD WIDTH=50%%>"
+       wprintf("<TD WIDTH=80%%>"
                "<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
                "bgcolor=#4444FF>\n");
 
        /* Display events before 8:00 (hour=-1 is all-day events) */
        wprintf("<TR>"
-               "<TD BGCOLOR=FFFFFF VALIGN=TOP></TD>"
+               "<TD BGCOLOR=CCCCDD VALIGN=MIDDLE WIDTH=10%%></TD>"
                "<TD BGCOLOR=FFFFFF VALIGN=TOP>");
        for (hour = (-1); hour <= 7; ++hour) {
                calendar_day_view_display_events(year, month, day, hour);
@@ -377,7 +344,8 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Now the middle of the day... */      
        for (hour = 8; hour <= 17; ++hour) {    /* could do HEIGHT=xx */
-               wprintf("<TR><TD BGCOLOR=FFFFFF ALIGN=RIGHT VALIGN=TOP>");
+               wprintf("<TR HEIGHT=30><TD BGCOLOR=CCCCDD ALIGN=MIDDLE "
+                       "VALIGN=MIDDLE WIDTH=10%%>");
                wprintf("<A HREF=\"/display_edit_event?msgnum=0"
                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
                        year, month, day, hour
@@ -396,7 +364,7 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Display events after 5:00... */
        wprintf("<TR>"
-               "<TD BGCOLOR=FFFFFF VALIGN=TOP></TD>"
+               "<TD BGCOLOR=CCCCDD VALIGN=MIDDLE WIDTH=10%%></TD>"
                "<TD BGCOLOR=FFFFFF VALIGN=TOP>");
        for (hour = 18; hour <= 23; ++hour) {
                calendar_day_view_display_events(year, month, day, hour);
@@ -405,7 +373,55 @@ void calendar_day_view(int year, int month, int day) {
 
 
        wprintf("</TABLE>"                      /* end of innermost table */
-               "</TD></TR></TABLE>"            /* end of inner table */
+               "</TD>"
+       );
+
+       wprintf("<TD WIDTH=20%% VALIGN=top>");  /* begin stuff-on-the-right */
+
+
+       /* Begin todays-date-with-left-and-right-arrows */
+       wprintf("<CENTER><TABLE BORDER=0 CELLSPACING=0 CELLPADDING=1><TR>\n");
+
+       wprintf("<TD>"
+               "<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
+               yesterday.year, yesterday.month, yesterday.day
+       );
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>"
+               "</TD>\n");
+
+       wprintf("<TD ALIGN=MIDDLE><FONT COLOR=#FFFFFF>"
+               "<H2>%s</H2><H1>%d</H1><H3>%d</H3>"
+               "</FONT></TD>",
+               months[month-1], day, year);
+
+       wprintf("<TD>"
+               "<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
+               tomorrow.year, tomorrow.month, tomorrow.day
+       );
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/forward.gif\""
+               " BORDER=0></A></TD>\n");
+
+       wprintf("</TR></TABLE></CENTER>\n");
+       /* End todays-date-with-left-and-right-arrows */
+
+       wprintf("<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);
+
+       wprintf("</FONT></CENTER>\n");
+
+       wprintf("</TD>");                       /* end stuff-on-the-right */
+
+
+
+       wprintf("</TR></TABLE>"                 /* end of inner table */
                "</TD></TR></TABLE>"            /* end of outer table */
        );
 

diff --git a/webcit/event.c b/webcit/event.c
index be58c3bb15c406acded70004f751f4a4965792eb..0cca6db2a05e28a7b4c00c0a8a39c8dc698276a8 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -328,7 +328,6 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
  */
 void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
        char buf[SIZ];
-       int delete_existing = 0;
        icalproperty *prop;
        icalcomponent *vevent;
        int created_new_vevent = 0;
@@ -522,18 +521,13 @@ STARTOVER:
                        serv_puts("");
                        serv_puts(icalcomponent_as_ical_string(vevent));
                        serv_puts("000");
-                       delete_existing = 1;
                }
        }
 
        /*
-        * If the user clicked 'Delete' then delete it, period.
+        * If the user clicked 'Delete' then delete it.
         */
-       if (!strcasecmp(bstr("sc"), "Delete")) {
-               delete_existing = 1;
-       }
-
-       if ( (delete_existing) && (msgnum > 0L) ) {
+       if ( (!strcasecmp(bstr("sc"), "Delete")) && (msgnum > 0L) ) {
                serv_printf("DELE %ld", atol(bstr("msgnum")));
                serv_gets(buf);
        }