* Calendar invitations: changed "Accept/Tentative/Decline" buttons to

  links in order to avoid them being in nested forms.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 512d13839091f053be45365bf623d02129e2f6ca..c0b103f37aa2494ac26e31c606eae1e2ba47b872 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 611.2  2005/06/04 04:07:36  ajc
+* Calendar invitations: changed "Accept/Tentative/Decline" buttons to
+  links in order to avoid them being in nested forms.
+
 Revision 611.1  2005/06/02 16:10:08  ajc
 * tools.c: generated uuid's no longer contain "{" and "}" characters.
 
@@ -2543,3 +2547,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 ed46e30ba51ce99c56fe3437772121904af8232a..13c6869c677b241d4186c2f5b6edb1f79a888357 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -259,23 +259,16 @@ void cal_process_object(icalcomponent *cal,
                lprintf(9, "...done.\n");
 
                /* Display the Accept/Decline buttons */
-               wprintf("<TR><TD COLSPAN=2>"
-                       "<FORM METHOD=\"GET\" "
-                       "ACTION=\"/respond_to_request\">\n"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Accept\">\n"
-                       "&nbsp;&nbsp;"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Tentative\">\n"
-                       "&nbsp;&nbsp;"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Decline\">\n"
-                       "<INPUT TYPE=\"hidden\" NAME=\"msgnum\" "
-                               "VALUE=\"%ld\">"
-                       "<INPUT TYPE=\"hidden\" NAME=\"cal_partnum\" "
-                               "VALUE=\"%s\">"
-                       "</FORM>"
-                       "</TD></TR>\n",
+               wprintf("<TR><TD>How would you like to respond to this invitation?</td>"
+                       "<td><FONT SIZE=+1>"
+                       "<A HREF=\"/respond_to_request?msgnum=%ld&cal_partnum=%s&sc=Accept\">Accept</a>"
+                       " | "
+                       "<A HREF=\"/respond_to_request?msgnum=%ld&cal_partnum=%s&sc=Tentative\">Tentative</a>"
+                       " | "
+                       "<A HREF=\"/respond_to_request?msgnum=%ld&cal_partnum=%s&sc=Decline\">Decline</a>"
+                       "</FONT></TD></TR>\n",
+                       msgnum, cal_partnum,
+                       msgnum, cal_partnum,
                        msgnum, cal_partnum
                );
 
@@ -293,21 +286,14 @@ void cal_process_object(icalcomponent *cal,
                 ***********/
 
                /* Display the update buttons */
-               wprintf("<TR><TD COLSPAN=2>"
+               wprintf("<TR><TD>"
                        "Click <i>Update</i> to accept this reply and "
                        "update your calendar."
-                       "<FORM METHOD=\"GET\" "
-                       "ACTION=\"/handle_rsvp\">\n"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Update\">\n"
-                       "&nbsp;&nbsp;"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Ignore\">\n"
-                       "<INPUT TYPE=\"hidden\" NAME=\"msgnum\" "
-                               "VALUE=\"%ld\">"
-                       "<INPUT TYPE=\"hidden\" NAME=\"cal_partnum\" "
-                               "VALUE=\"%s\">"
-                       "</FORM>"
+                       "</td><td><font size=+1>"
+                       "<a href=\"/handle_rsvp?msgnum=%ld&cal_partnum=%s&sc=Update\">Update</a>"
+                       " | "
+                       "<a href=\"/handle_rsvp?msgnum=%ld&cal_partnum=%s&sc=Ignore\">Ignore</a>"
+                       "</font>"
                        "</TD></TR>\n",
                        msgnum, cal_partnum
                );