From 91ce8f299a40f815e0f6cd2efdaaca917e406ad2 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 14 May 2003 03:46:35 +0000
Subject: [PATCH] * More background cleanup

---
 webcit/ChangeLog    |  4 +++-
 webcit/roomops.c    | 11 +++++++----
 webcit/sysmsgs.c    | 20 ++++++++++----------
 webcit/vcard_edit.c |  4 +++-
 webcit/webcit.c     |  4 ++--
 webcit/webcit.h     |  2 +-
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index c0fa2ec2a..feea5d259 100644
--- 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 bff0aec93..e3886724d 100644
--- 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 859872afd..029bd0e45 100644
--- 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 8365b54c8..f61141947 100644
--- 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 f068f8904..3b1c058af 100644
--- 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 e1211c851..2f3b340a1 100644
--- 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);
-- 
2.39.2