* The previous <div style=\"margin-right:1px\"> has been replaced by a

[citadel.git] / webcit / paging.c

diff --git a/webcit/paging.c b/webcit/paging.c
index fe4a9141b9aecfd50ee31c8f2ffbbe6a618c1fb8..c892b7a64ed9926286d76b34962692e584450297 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -36,10 +36,20 @@ void display_page(void)
 
        strcpy(recp, bstr("recp"));
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-
-       svprintf("BOXTITLE", WCS_STRING, "Page: %s", recp);
-       do_template("beginbox");
+        output_headers(1, 1, 2, 0, 0, 0, 0);
+        wprintf("<div id=\"banner\">\n"
+                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<SPAN CLASS=\"titlebar\">Send instant message</SPAN>"
+                "</TD></TR></TABLE>\n"
+                "</div>\n<div id=\"content\">\n"
+        );
+                                                                                                                             
+        wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+
+       wprintf("Send an instant message to: ");
+       escputs(recp);
+       wprintf("<br>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/page_user\">\n");
 
@@ -64,7 +74,7 @@ void display_page(void)
        wprintf("<br /><A HREF=\"javascript:window.close();\"Cancel</A>\n");
 
        wprintf("</FORM></CENTER>\n");
-       do_template("endbox");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
 
@@ -78,8 +88,14 @@ void page_user(void)
        char buf[SIZ];
        char closewin[SIZ];
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-
+        output_headers(1, 1, 2, 0, 0, 0, 0);
+        wprintf("<div id=\"banner\">\n"
+                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<SPAN CLASS=\"titlebar\">Add or edit an event</SPAN>"
+                "</TD></TR></TABLE>\n"
+                "</div>\n<div id=\"content\">\n"
+        );
+                                                                                                                             
        strcpy(recp, bstr("recp"));
        strcpy(sc, bstr("sc"));
        strcpy(closewin, bstr("closewin"));
@@ -151,32 +167,24 @@ void page_popup(void)
        char buf[SIZ];
        char pagefrom[SIZ];
 
-       /* suppress express message check, do headers but no banner */
-       output_headers(1, 1, 0, 0, 0, 1, 0);
-
        while (serv_puts("GEXP"), serv_gets(buf), buf[0]=='1') {
 
                extract(pagefrom, &buf[4], 3);
 
-               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-               wprintf("<SPAN CLASS=\"titlebar\">Instant message from ");
+               wprintf("<table border=1 bgcolor=\"#880000\"><tr><td>");
+               wprintf("<span class=\"titlebar\">Instant message from ");
                escputs(pagefrom);
-               wprintf("</SPAN></TD></TR></TABLE>\n");
-               
+               wprintf("</span></td></tr><tr><td><font color=\"#FFFFFF\">");
                fmout(NULL, "LEFT");
+               wprintf("</font></td></tr>"
+                       "<tr><td><div align=center><font color=\"#FFFFFF\">"
+                       "<a href=\"javascript:hide_page_popup()\">[ close window ]</a>"
+                       "</font></div>"
+                       "</td></tr>"
+                       "</table>\n");
        }
 
-       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>");
-
-       wDumpContent(1);
-       WC->HaveExpressMessages = 0;
+       WC->HaveInstantMessages = 0;
 }