* More background cleanup

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index c0fa2ec2aee3c50667f645ffdd3446ebcca83f6c..feea5d259b45d0f4269fcdf013b055f3364cb9f3 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 410.26  2003/05/14 03:46:35  ajc
+* More background cleanup
+
 Revision 410.25  2003/05/05 17:19:46  ajc
 * Cleanups to summary page when running on a non ical enabled system
 * Use non breaking spaces in summary page box titles
@@ -1382,4 +1385,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/roomops.c b/webcit/roomops.c
index bff0aec93bdba1fc93f1396308b0e045a01966e0..e3886724ddbc501957b66fc0c85ef68a80e3bbc9 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -818,12 +818,12 @@ void display_editroom(void)
                wprintf("</A></TD>\n");
        }
 
-       wprintf("<TD>&nbsp;</TD></TR>"
-               "<TR><TD BGCOLOR=\"#000077\" COLSPAN=9 HEIGHT=5> </TD></TR>"
-               "</TABLE>\n");
-
+       wprintf("</TR></TABLE>\n");
        /* end tabbed dialog */ 
 
+       /* begin content of whatever tab is open now */
+       wprintf("<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
+               "<TR><TD>\n");
 
        if (!strcmp(tab, "admin")) {
                wprintf("<UL>"
@@ -1139,6 +1139,9 @@ void display_editroom(void)
                wprintf("</CENTER>\n");
        }
 
+       /* end content of whatever tab is open now */
+       wprintf("</TD></TR></TABLE>\n");
+
        wDumpContent(1);
 }
 

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 859872afd7aa8ca7da534bf38deaf5799989ba8b..029bd0e456cec386138f315c7ff4254c3a4e97e0 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -32,7 +32,7 @@
  * display the form for editing something (room info, bio, etc)
  */
 void display_edit(char *description, char *check_cmd,
-                 char *read_cmd, char *save_cmd)
+                 char *read_cmd, char *save_cmd, int headers_type)
 {
        char buf[SIZ];
 
@@ -43,12 +43,10 @@ void display_edit(char *description, char *check_cmd,
                display_error(&buf[4]);
                return;
        }
-       output_headers(1);
+       output_headers(headers_type);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Edit ");
-       escputs(description);
-       wprintf("</SPAN></TD></TR></TABLE>\n");
+       svprintf("BOXTITLE", WCS_STRING, "Edit %s", description);
+       do_template("beginbox");
 
        wprintf("<CENTER>Enter %s below.  Text is formatted to\n", description);
        wprintf("the <EM>reader's</EM> screen width.  To defeat the\n");
@@ -56,16 +54,18 @@ void display_edit(char *description, char *check_cmd,
        wprintf("<BR>");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"%s\">\n", save_cmd);
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
-       wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=30 COLS=80 WIDTH=80>");
+       wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft "
+               "ROWS=10 COLS=80 WIDTH=80>\n");
        serv_puts(read_cmd);
        serv_gets(buf);
        if (buf[0] == '1')
                server_to_text();
-       wprintf("</TEXTAREA><P>\n");
+       wprintf("</TEXTAREA><BR><BR>\n");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
 
        wprintf("</FORM></CENTER>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 8365b54c837799f299703d98cac2403372e76877..f61141947e559a388bd0c64642e4f1d7e0827c1e 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -163,6 +163,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        vcard_free(v);
 
        /* Display the form */
+       do_template("beginbox_nt");
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
        wprintf("<H2><IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
                "Contact information for ");
@@ -249,7 +250,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                 wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
                 wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
                 wprintf("</CENTER></FORM>\n");
-
+       
+       do_template("endbox");
        wDumpContent(1);
 }
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index f068f8904e6709adc347bb844b4e55f05fe20392..3b1c058af9d1930d52df5a63099567d2a615e8c0 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1028,12 +1028,12 @@ void session_loop(struct httprequest *req)
         } else if (!strcasecmp(action, "display_whok")) {
                 display_whok();
        } else if (!strcasecmp(action, "display_editinfo")) {
-               display_edit("Room info", "EINF 0", "RINF", "/editinfo");
+               display_edit("Room info", "EINF 0", "RINF", "/editinfo", 1);
        } else if (!strcasecmp(action, "editinfo")) {
                save_edit("Room info", "EINF 1", 1);
        } else if (!strcasecmp(action, "display_editbio")) {
                sprintf(buf, "RBIO %s", WC->wc_username);
-               display_edit("Your bio", "NOOP", buf, "editbio");
+               display_edit("Your bio", "NOOP", buf, "editbio", 3);
        } else if (!strcasecmp(action, "editbio")) {
                save_edit("Your bio", "EBIO", 0);
        } else if (!strcasecmp(action, "confirm_delete_room")) {

diff --git a/webcit/webcit.h b/webcit/webcit.h
index e1211c851a7a6b52917b5c2aebe117d163edd7bf..2f3b340a1f4c1da9b5ad40d9beaeac3eef861b4d 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -300,7 +300,7 @@ void display_whok(void);
 void server_to_text(void);
 void save_edit(char *description, char *enter_cmd, int regoto);
 void display_edit(char *description, char *check_cmd,
-                 char *read_cmd, char *save_cmd);
+                 char *read_cmd, char *save_cmd, int headers_type);
 void gotoroom(char *gname, int display_name);
 void confirm_delete_room(void);
 void delete_room(void);