From b3aee261c6e1e1cff68133443412ec9494b036ac Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 5 Jun 2003 03:52:32 +0000 Subject: [PATCH] * Buncha cosmetic changes --- webcit/ChangeLog | 4 +++- webcit/auth.c | 14 +++++++++----- webcit/graphics.c | 20 +++++++++++++------- webcit/messages.c | 5 ++++- webcit/roomops.c | 16 ++++++++++------ webcit/static/prompt_for_recipient.html | 15 ++++++++++++--- webcit/static/style.css | 6 +++--- webcit/vcard_edit.c | 10 ++++++---- 8 files changed, 60 insertions(+), 30 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 178515384..6bcf34048 100644 --- 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 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/auth.c b/webcit/auth.c index 591e00797..04f755e2b 100644 --- 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("
"); + wprintf("

"); serv_puts("MESG changepw"); serv_gets(buf); if (buf[0] == '1') { @@ -341,13 +341,17 @@ void display_changepw(void) } wprintf("
\n"); - wprintf("
\n"); + wprintf("
" + "
Enter new password:
" + "\n"); wprintf("\n"); wprintf("\n"); wprintf("\n"); - wprintf("
Enter new password:
Enter it again to confirm:
\n"); - wprintf("\n"); - wprintf("\n"); + wprintf("
\n"); + wprintf("\n" + " " + "\n"); wprintf("
\n"); do_template("endbox"); wDumpContent(1); diff --git a/webcit/graphics.c b/webcit/graphics.c index 7616be447..9922e1dbf 100644 --- 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("
"); - wprintf("Set/change %s\n", description); - wprintf("
\n"); + + svprintf("BOXTITLE", WCS_STRING, "Set/change your photo"); + do_template("beginbox"); wprintf("
\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).

\n"); - wprintf("Please select a file to upload:
\n"); + wprintf("Please select a file to upload:

\n"); wprintf("\n"); - wprintf("
"); - wprintf("\n"); + wprintf("

"); + wprintf("\n"); wprintf("\n"); + wprintf("\n"); wprintf("\n"); - wprintf("Cancel\n"); wprintf("
\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 d053a4be6..10b0bbdfb 100644 --- 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("%s
\n", &buf[4]); + svprintf("RECPERROR", WCS_STRING, + "%s
\n", + &buf[4] + ); } do_template("prompt_for_recipient"); goto DONE; diff --git a/webcit/roomops.c b/webcit/roomops.c index e22c591f5..f7640d76f 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -1527,7 +1527,7 @@ void display_private(char *rname, int req_pass) do_template("beginbox"); wprintf("
\n"); - wprintf("If you know the name of a hidden (guess-name) or\n"); + wprintf("
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("
\n"); - wprintf("
"); - wprintf("Enter room name:"); - wprintf("\n", rname); + wprintf("\n" + "
" + "Enter room name:" + "\n", rname); if (req_pass) { wprintf("
"); @@ -1547,8 +1550,9 @@ void display_private(char *rname, int req_pass) } wprintf("

\n"); - wprintf(""); - wprintf(""); + wprintf("" + " " + ""); wprintf("\n"); do_template("endbox"); wDumpContent(1); diff --git a/webcit/static/prompt_for_recipient.html b/webcit/static/prompt_for_recipient.html index d04164e4f..a90ddef06 100644 --- a/webcit/static/prompt_for_recipient.html +++ b/webcit/static/prompt_for_recipient.html @@ -3,10 +3,19 @@ Send private e-mail
+ +
+ +
-Enter recipient: -
+Enter recipient(s):  +

+  -
+ +
+
+
+ diff --git a/webcit/static/style.css b/webcit/static/style.css index 31002dfa1..0e9cb5b42 100644 --- 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 f61141947..65f0f3fc1 100644 --- 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("
\n"); - wprintf(""); - wprintf(""); - wprintf("
\n"); + wprintf("
\n" + "" + " " + "" + "
\n" + ); do_template("endbox"); wDumpContent(1); -- 2.39.2