* "reply" button on pop-up pages

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index ad8b681682f351abfba83cf0932de4179f8c1e43..15b4553635d497b01d38eb3e7f0c9d7784b0ebc3 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 301.17  2001/12/15 20:51:33  ajc
+* "reply" button on pop-up pages
+
 Revision 301.16  2001/12/11 16:02:40  ajc
 * Completed support for add/remove mailing list recipients.
 
@@ -659,4 +662,3 @@ 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/paging.c b/webcit/paging.c
index 9b506109ff9b35e151843f65623d26970bf23f70..9cdb897ebe304761f675185881ea5c70674e56bb 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -39,7 +39,7 @@ void display_page(void)
        wprintf("</FONT></TD></TR></TABLE>\n");
 
        wprintf("<CENTER>This will send a page (instant message) "
-               "to %s.<BR><BR>\n", recp);
+               "to %s.\n", recp);
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/page_user\">\n");
 
@@ -50,10 +50,14 @@ void display_page(void)
        escputs(recp);
        wprintf("\">\n");
 
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"closewin\" VALUE=\"");
+       escputs(bstr("closewin"));
+       wprintf("\">\n");
+
        wprintf("Enter message text:<BR>");
 
        wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=5 COLS=40 "
-               "WIDTH=40></TEXTAREA><P>\n");
+               "WIDTH=40></TEXTAREA>\n");
 
        wprintf("</TD></TR></TABLE><BR>\n");
 
@@ -72,11 +76,13 @@ void page_user(void)
        char recp[SIZ];
        char sc[SIZ];
        char buf[SIZ];
+       char closewin[SIZ];
 
        output_headers(1);
 
        strcpy(recp, bstr("recp"));
        strcpy(sc, bstr("sc"));
+       strcpy(closewin, bstr("closewin"));
 
        if (strcmp(sc, "Send message")) {
                wprintf("<EM>Message was not sent.</EM><BR>\n");
@@ -95,6 +101,12 @@ void page_user(void)
                        wprintf("<EM>%s</EM><BR>\n", &buf[4]);
                }
        }
+       
+       if (!strcasecmp(closewin, "yes")) {
+               wprintf("<CENTER><A HREF=\"javascript:window.close();\">"
+                       "[ close window ]</A></CENTER>\n");
+       }
+
        wDumpContent(1);
 }
 
@@ -154,8 +166,12 @@ void page_popup(void)
                fmout(NULL);
        }
 
-       wprintf("<CENTER>"
-               "<A HREF=\"javascript:window.close();\">"
+       wprintf("<CENTER>");
+       wprintf("<A HREF=\"/display_page&closewin=yes&recp=");
+       urlescputs(pagefrom);
+        wprintf("\">[ reply ]</A>&nbsp;&nbsp;&nbsp;\n");
+
+       wprintf("<A HREF=\"javascript:window.close();\">"
                "[ close window ]</A></B>\n"
                "</CENTER>");
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 8aa27b7ca02b7f8ba8e48f0e339f47f8b1e80164..d2be7d4146f74975ad697aaa4cc9832f8af0ed28 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -339,7 +339,7 @@ void output_headers(int controlcode)
                wprintf("function launch_page_popup() {\n");
                wprintf("pwin = window.open('/page_popup', 'CitaPage%d', "
                        "'toolbar=no,location=no,copyhistory=no,status=no,"
-                       "scrollbars=yes,resizable=no,height=150,width=400');\n",
+                       "scrollbars=yes,resizable=no,height=250,width=400');\n",
                        ++pageseq);
                wprintf("}\n");
                wprintf("</SCRIPT>\n");