* Buncha cosmetic changes

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 178515384c549111c0f4d84beeae07ee40a90ce6..6bcf34048b71881ee8fd8416656c54698955adb0 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 410.44  2003/06/05 03:52:29  ajc
+* Buncha cosmetic changes
+
 Revision 410.43  2003/06/04 03:41:25  ajc
 * Change the appearance of rooms with and without new messages in the
   room list -- now defined using CSS
@@ -1451,4 +1454,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/auth.c b/webcit/auth.c
index 591e00797a4562b003ab43065cb0c980ca0edc2f..04f755e2bafc7e34bbce6cd8dbcb92a4ac0963e4 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -333,7 +333,7 @@ void display_changepw(void)
 
        svprintf("BOXTITLE", WCS_STRING, "Change your password");
        do_template("beginbox");
-       wprintf("<CENTER>");
+       wprintf("<CENTER><BR>");
        serv_puts("MESG changepw");
        serv_gets(buf);
        if (buf[0] == '1') {
@@ -341,13 +341,17 @@ void display_changepw(void)
        }
 
        wprintf("<FORM ACTION=\"changepw\" METHOD=\"POST\">\n");
-       wprintf("<CENTER><TABLE border><TR><TD>Enter new password:</TD>\n");
+       wprintf("<CENTER>"
+               "<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
+               "BGCOLOR=\"#EEEEEE\">"
+               "<TR><TD>Enter new password:</TD>\n");
        wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
        wprintf("<TR><TD>Enter it again to confirm:</TD>\n");
        wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
-       wprintf("</TABLE>\n");
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n");
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
+       wprintf("</TABLE><BR>\n");
+       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n"
+               "&nbsp;"
+               "<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
        wprintf("</CENTER>\n");
        do_template("endbox");
        wDumpContent(1);

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 7616be44772e8f8aed99547d5a79ef7a8fc56459..9922e1dbf0e796aedc394d642321a8d1693c5805 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -31,9 +31,9 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
                return;
        }
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Set/change %s</SPAN>\n", description);
-       wprintf("</TD></TR></TABLE>\n");
+
+       svprintf("BOXTITLE", WCS_STRING, "Set/change your photo");
+       do_template("beginbox");
 
        wprintf("<CENTER>\n");
 
@@ -48,14 +48,15 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        wprintf("as long as it is in GIF format (JPEG, PNG, etc. won't\n");
        wprintf("work).<BR><BR>\n");
 
-       wprintf("Please select a file to upload:<BR>\n");
+       wprintf("Please select a file to upload:<BR><BR>\n");
        wprintf("<INPUT TYPE=\"FILE\" NAME=\"filename\" SIZE=\"35\">\n");
-       wprintf("<BR>");
-       wprintf("<INPUT TYPE=\"SUBMIT\" VALUE=\"Upload\">\n");
+       wprintf("<BR><BR>");
+       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Upload\">\n");
        wprintf("<INPUT TYPE=\"RESET\" VALUE=\"Reset Form\">\n");
+       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Cancel\">\n");
        wprintf("</FORM>\n");
-       wprintf("<A HREF=\"/display_main_menu\">Cancel</A>\n");
        wprintf("</CENTER>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -66,6 +67,11 @@ void do_graphics_upload(char *upl_cmd)
        int pos = 0;
        int thisblock;
 
+       if (!strcasecmp(bstr("sc"), "Cancel")) {
+               display_main_menu();
+               return;
+       }
+
        if (WC->upload_length == 0) {
                display_error("You didn't upload a file.\n");
                return;

diff --git a/webcit/messages.c b/webcit/messages.c
index d053a4be6660b2f4e884a875ba3c7083185e4150..10b0bbdfb146d39ceea7dfed81058a97687fafec 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1131,7 +1131,10 @@ void display_enter(void)
 
        if (!strncmp(buf, "570", 3)) {
                if (strlen(bstr("recp")) > 0) {
-                       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+                       svprintf("RECPERROR", WCS_STRING,
+                               "<SPAN CLASS=\"errormsg\">%s</SPAN><BR>\n",
+                               &buf[4]
+                       );
                }
                do_template("prompt_for_recipient");
                goto DONE;

diff --git a/webcit/roomops.c b/webcit/roomops.c
index e22c591f58858c084fa8ecf601cb2702f687f42f..f7640d76f0f84a975a3fb1b62689e5f8bff5c600 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1527,7 +1527,7 @@ void display_private(char *rname, int req_pass)
        do_template("beginbox");
 
        wprintf("<CENTER>\n");
-       wprintf("If you know the name of a hidden (guess-name) or\n");
+       wprintf("<BR>If you know the name of a hidden (guess-name) or\n");
        wprintf("passworded room, you can enter that room by typing\n");
        wprintf("its name below.  Once you gain access to a private\n");
        wprintf("room, it will appear in your regular room listings\n");
@@ -1536,9 +1536,12 @@ void display_private(char *rname, int req_pass)
 
        wprintf("<FORM METHOD=\"GET\" ACTION=\"/goto_private\">\n");
 
-       wprintf("<TABLE border><TR><TD>");
-       wprintf("Enter room name:</TD><TD>");
-       wprintf("<INPUT TYPE=\"text\" NAME=\"gr_name\" VALUE=\"%s\" MAXLENGTH=\"19\">\n", rname);
+       wprintf("<table border=\"0\" cellspacing=\"5\" "
+               "cellpadding=\"5\" BGCOLOR=\"#EEEEEE\">\n"
+               "<TR><TD>"
+               "Enter room name:</TD><TD>"
+               "<INPUT TYPE=\"text\" NAME=\"gr_name\" "
+               "VALUE=\"%s\" MAXLENGTH=\"19\">\n", rname);
 
        if (req_pass) {
                wprintf("</TD></TR><TR><TD>");
@@ -1547,8 +1550,9 @@ void display_private(char *rname, int req_pass)
        }
        wprintf("</TD></TR></TABLE><BR>\n");
 
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+               "&nbsp;"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</FORM>\n");
        do_template("endbox");
        wDumpContent(1);

diff --git a/webcit/static/prompt_for_recipient.html b/webcit/static/prompt_for_recipient.html
index d04164e4f0e3d218a3a859cf7bd4c7e5151e4316..a90ddef06a877e879656b17bed635e597aa43c15 100644 (file)
--- a/webcit/static/prompt_for_recipient.html
+++ b/webcit/static/prompt_for_recipient.html
@@ -3,10 +3,19 @@
 Send private e-mail
 </SPAN></TD></TR></TABLE>
 
+<?=beginbox_nt>
+<?RECPERROR>
 <CENTER>
+<table border="0" cellspacing="5" cellpadding="5" BGCOLOR="#EEEEEE">
+<TR><TD>
 <FORM METHOD="POST" ACTION="/display_enter">
-Enter recipient:
-<INPUT TYPE="text" NAME="recp" MAXLENGTH="64"><BR>
+Enter recipient(s):&nbsp;
+<INPUT TYPE="text" NAME="recp" MAXLENGTH="64"><BR><BR>
 <INPUT TYPE="submit" NAME="sc" VALUE="Enter message">
+&nbsp;
 <INPUT TYPE="submit" NAME="sc" VALUE="Cancel">
-</FORM></CENTER>
+</FORM>
+<BR>
+</TD></TR></TABLE>
+</CENTER>
+<?=endbox>

diff --git a/webcit/static/style.css b/webcit/static/style.css
index 31002dfa1d4a21a70dbaa70440b2353b36fefd4a..0e9cb5b4232c71d053812bdda7289e6b90bbef02 100644 (file)
--- a/webcit/static/style.css
+++ b/webcit/static/style.css
@@ -268,10 +268,10 @@ var sub { font-style: normal }
   float: right
 }
 
-.error {
-  color: #DC143C;
+.errormsg {
+  color: #AA0000;
   background: none;
-  text-decoration: none
+  font-style: italic;
 }
 
 .warning {

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index f61141947e559a388bd0c64642e4f1d7e0827c1e..65f0f3fc1c25eec7526820808ab2f51c7bd56396 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -246,10 +246,12 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        urlescputs(return_to);
        wprintf("\">\n");
 
-       wprintf("<CENTER>\n");
-                wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
-                wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-                wprintf("</CENTER></FORM>\n");
+       wprintf("<CENTER>\n"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+               "&nbsp;"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
+               "</CENTER></FORM>\n"
+       );
        
        do_template("endbox");
        wDumpContent(1);