* Better alignment of system messages

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 0e3dc6a64c5a728c0774d4959c47b38709988fe7..d4b6545d444a8300aea2d52f37acf6623cc338f3 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -32,24 +32,22 @@
  * 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[256];
+       char buf[SIZ];
 
        serv_puts(check_cmd);
        serv_gets(buf);
 
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
-       output_headers(1);
+       output_headers(headers_type);
 
-       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Edit ");
-       escputs(description);
-       wprintf("</B></FONT></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");
@@ -57,16 +55,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);
 }
 
@@ -76,28 +76,30 @@ void display_edit(char *description, char *check_cmd,
  */
 void save_edit(char *description, char *enter_cmd, int regoto)
 {
-       char buf[256];
+       char buf[SIZ];
 
        if (strcmp(bstr("sc"), "Save")) {
-               output_headers(1);
-               wprintf("Cancelled.  %s was not saved.<BR>\n", description);
-               wDumpContent(1);
+               sprintf(WC->ImportantMessage,
+                       "Cancelled.  %s was not saved.\n", description);
+               display_main_menu();
                return;
        }
        serv_puts(enter_cmd);
        serv_gets(buf);
        if (buf[0] != '4') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
-       text_to_server(bstr("msgtext"));
+       text_to_server(bstr("msgtext"), 0);
        serv_puts("000");
 
        if (regoto) {
                smart_goto(WC->wc_roomname);
        } else {
-               output_headers(1);
-               wprintf("%s has been saved.\n", description);
-               wDumpContent(1);
+               sprintf(WC->ImportantMessage,
+                       "%s has been saved.\n", description);
+               display_main_menu();
+               return;
        }
 }