* After setup is complete, tell them how to log in.

* Don't allow the creation of accounts with blank passwords.
* Don't allow users to change to a blank password.
* Fixed the positioning of a few more screens that accidentally got
  partially hidden underneath the iconbar.
* Boldfaced the "Password changed." and other prompts.
* Removed the unreadable blue-on-blue links in the calendar day
  view.  They're redundant anyway, now: "Add new calendar event" and
  "month view" are both in the banner bar.
* "New messages / All messages" are now "Read new messages / Read all
  messages"
* "Save message" button is now "Post message" for public room posts,
  and "Send message" for email.
* "Message has been posted" is now "Message has been sent" for email.
* Swapped positions of "Add users" and "Edit users" boxes.
* vCard editor: "Other Internet email addresses" is now "aliases"
* Renamed the "Users" button to "Who is online?"

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index a726751bb26886a2560896b98a533537914ad498..dfb63079f95b63136225b5ef05cbd6ace09b246d 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,23 @@
 $Log$
+Revision 602.3  2005/02/17 04:48:26  ajc
+* After setup is complete, tell them how to log in.
+* Don't allow the creation of accounts with blank passwords.
+* Don't allow users to change to a blank password.
+* Fixed the positioning of a few more screens that accidentally got
+  partially hidden underneath the iconbar.
+* Boldfaced the "Password changed." and other prompts.
+* Removed the unreadable blue-on-blue links in the calendar day
+  view.  They're redundant anyway, now: "Add new calendar event" and
+  "month view" are both in the banner bar.
+* "New messages / All messages" are now "Read new messages / Read all
+  messages"
+* "Save message" button is now "Post message" for public room posts,
+  and "Send message" for email.
+* "Message has been posted" is now "Message has been sent" for email.
+* Swapped positions of "Add users" and "Edit users" boxes.
+* vCard editor: "Other Internet email addresses" is now "aliases"
+* Renamed the "Users" button to "Who is online?"
+
 Revision 602.2  2005/02/16 05:40:31  ajc
 * More display fixes
 
@@ -2365,4 +2384,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 fef785e07e620bc23765ed7dd7f32d2646840b6a..9c57a6e67681aec371ea67cf2bf5d1b98e60ee3e 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -125,6 +125,10 @@ void do_login(void)
                }
        }
        if (!strcasecmp(bstr("action"), "New User")) {
+               if (strlen(bstr("pass")) == 0) {
+                       display_login("Blank passwords are not allowed.");
+                       return;
+               }
                serv_printf("NEWU %s", bstr("name"));
                serv_gets(buf);
                if (buf[0] == '2') {
@@ -219,8 +223,14 @@ void validate(void)
        char buf[SIZ];
        int a;
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Validate new users</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+                                                                                                                            
        strcpy(buf, bstr("user"));
        if (strlen(buf) > 0)
                if (strlen(bstr("axlevel")) > 0) {
@@ -239,8 +249,7 @@ void validate(void)
                return;
        }
 
-       wprintf("<center>");
-       do_template("beginbox_nt");
+       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<center>");
 
        strcpy(user, &buf[4]);
@@ -286,8 +295,7 @@ void validate(void)
        wprintf("<br />\n");
 
        wprintf("</CENTER>\n");
-       do_template("endbox");
-       wprintf("</CENTER>\n");
+       wprintf("</td></tr></table></center>\n");
        wDumpContent(1);
 }
 
@@ -334,10 +342,24 @@ void display_changepw(void)
 {
        char buf[SIZ];
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Change your password</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       if (strlen(WC->ImportantMessage) > 0) {
+               do_template("beginbox_nt");
+               wprintf("<SPAN CLASS=\"errormsg\">"
+                       "%s</SPAN><br />\n", WC->ImportantMessage);
+               do_template("endbox");
+               strcpy(WC->ImportantMessage, "");
+       }
+
+       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
 
-       svprintf("BOXTITLE", WCS_STRING, "Change your password");
-       do_template("beginbox");
        wprintf("<CENTER><br />");
        serv_puts("MESG changepw");
        serv_gets(buf);
@@ -345,7 +367,7 @@ void display_changepw(void)
                fmout(NULL, "CENTER");
        }
 
-       wprintf("<FORM ACTION=\"changepw\" METHOD=\"POST\">\n");
+       wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\" onLoad=\"document.changepwform.action.disabled = true\">\n");
        wprintf("<CENTER>"
                "<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
                "BGCOLOR=\"#EEEEEE\">"
@@ -353,12 +375,13 @@ void display_changepw(void)
        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><br />\n");
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n"
+       wprintf("<INPUT type=\"submit\" name=\"action\" value=\"Change\">"
                "&nbsp;"
-               "<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
-       wprintf("</CENTER>\n");
-       do_template("endbox");
+               "<INPUT type=\"submit\" name=\"action\" value=\"Cancel\">\n");
+       wprintf("</form></center>\n");
+       wprintf("</td></tr></table></center>\n");
        wDumpContent(1);
 }
 
@@ -376,17 +399,31 @@ void changepw(void)
                display_main_menu();
                return;
        }
+
        strcpy(newpass1, bstr("newpass1"));
        strcpy(newpass2, bstr("newpass2"));
 
        if (strcasecmp(newpass1, newpass2)) {
                strcpy(WC->ImportantMessage, 
                        "They don't match.  Password was not changed.");
-               display_main_menu();
+               display_changepw();
+               return;
+       }
+
+       if (strlen(newpass1) == 0) {
+               strcpy(WC->ImportantMessage, 
+                       "Blank passwords are not allowed.");
+               display_changepw();
                return;
        }
+
        serv_printf("SETP %s", newpass1);
        serv_gets(buf);
-       strcpy(WC->ImportantMessage, &buf[4]);
-       display_main_menu();
+       sprintf(WC->ImportantMessage, "%s", &buf[4]);
+       if (buf[0] == '2') {
+               display_main_menu();
+       }
+       else {
+               display_changepw();
+       }
 }

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 93a7d4059091624fe83107507b50692a720a069f..da14cde2cfbeeadf00a63f5830db29477e4ed68e 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -425,16 +425,7 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("</TR></TABLE>\n");
        /* End todays-date-with-left-and-right-arrows */
 
-       wprintf("<br /><br /><CENTER><font color=#FFFFFF>"
-               "&nbsp;<A HREF=\"/display_edit_event?msgnum=0"
-               "&year=%d&month=%d&day=%d\">"
-               "Add new calendar event</A>"
-               "<br /><br />\n",
-               year, month, day
-       );
-
-       wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">"
-               "Back to month view</A>\n", year, month);
+       /* In the future we might want to put a month-o-matic here */
 
        wprintf("</FONT></CENTER>\n");
 

diff --git a/webcit/floors.c b/webcit/floors.c
index 075942447b5212057242b2d397b3f076eb1ee67a..31cd1c8106a46d9231c66180556f751741b5b28e 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -43,29 +43,32 @@ void display_floorconfig(char *prepend_html)
        char floorname[SIZ];
        int refcount;
 
-       output_headers(1, 1, 2, 0, 0, 0, 0);
-
+        output_headers(1, 1, 2, 0, 0, 0, 0);
+        wprintf("<div id=\"banner\">\n"
+                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<SPAN CLASS=\"titlebar\">Add/change/delete floors</SPAN>"
+                "</TD></TR></TABLE>\n"
+                "</div>\n<div id=\"content\">\n"
+        );
+                                                                                                                             
        if (prepend_html != NULL) {
+               wprintf("<br /><b><i>");
                client_write(prepend_html, strlen(prepend_html));
+               wprintf("</i></b><br /><br />\n");
        }
 
-       serv_printf("LFLR");    /* FIXME put a real test here */
+       serv_printf("LFLR");
        serv_gets(buf);
        if (buf[0] != '1') {
-               wprintf("<div id=\"banner\">\n");
                wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
                wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
                wprintf("</TD></TR></TABLE>\n");
-               wprintf("</div>\n<div id=\"content\">\n");
                wprintf("%s<br />\n", &buf[4]);
                wDumpContent(1);
                return;
        }
 
-       svprintf("BOXTITLE", WCS_STRING, "Floor configuration");
-       do_template("beginbox");
-
-       wprintf("<TABLE BORDER=1 WIDTH=100%>\n"
+       wprintf("<center><TABLE BORDER=1 WIDTH=99%% bgcolor=\"#ffffff\">\n"
                "<TR><TH>Floor number</TH>"
                "<TH>Floor name</TH>"
                "<TH>Number of rooms</TH></TR>\n"
@@ -114,8 +117,7 @@ void display_floorconfig(char *prepend_html)
                "</FORM></TD>"
                "<TD>&nbsp;</TD></TR>\n");
 
-       wprintf("</TABLE>\n");
-       do_template("endbox");
+       wprintf("</table></center>\n");
        wDumpContent(1);
 }
 
@@ -132,11 +134,10 @@ void delete_floor(void) {
        serv_gets(buf);
 
        if (buf[0] == '2') {
-               sprintf(message, "<B><I>Floor has been deleted."
-                               "</I></B><br /><br />\n");
+               sprintf(message, "Floor has been deleted.");
        }
        else {
-               sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
+               sprintf(message, "%s", &buf[4]);
        }
 
        display_floorconfig(message);
@@ -153,7 +154,11 @@ void create_floor(void) {
        serv_printf("CFLR %s|1", floorname);
        serv_gets(buf);
 
-       sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
+       if (buf[0] == '2') {
+               sprintf(message, "New floor has been created.");
+       } else {
+               sprintf(message, "%s", &buf[4]);
+       }
 
        display_floorconfig(message);
 }
@@ -171,7 +176,7 @@ void rename_floor(void) {
        serv_printf("EFLR %d|%s", floornum, floorname);
        serv_gets(buf);
 
-       sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
+       sprintf(message, "%s", &buf[4]);
 
        display_floorconfig(message);
 }

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 293e62d440ff6590c848619f736f7119e2dd9e21..0fd151a938fee9dcdee9d0d935608d4f3efd1c73 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -216,7 +216,7 @@ void do_iconbar(void) {
                        "SRC=\"/static/users-icon.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Users");
+                       wprintf("Who is online?");
                }
                wprintf("</A></li>\n");
        }
@@ -487,7 +487,7 @@ void display_customize_iconbar(void) {
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/users-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Users</B><br />"
+               "<B>Who is online?</B><br />"
                "Clicking this icon displays a list of all users "
                "currently logged in."
                "</TD></TR>\n",

diff --git a/webcit/messages.c b/webcit/messages.c
index 4bb7057f0673485a8f69a28d4211e3feb6a157e7..41a976cca06a9544f66d0f44c78fb885d7e6db54 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1487,8 +1487,12 @@ void post_message(void)
                serv_gets(buf);
                if (buf[0] == '4') {
                        post_mime_to_server();
-                       sprintf(WC->ImportantMessage, 
-                               "Message has been posted.\n");
+                       if (strlen(bstr("recp")) > 0) {
+                               sprintf(WC->ImportantMessage, "Message has been sent.\n");
+                       }
+                       else {
+                               sprintf(WC->ImportantMessage, "Message has been posted.\n");
+                       }
                        dont_post = atol(bstr("postseq"));
                } else {
                        sprintf(WC->ImportantMessage, 
@@ -1602,8 +1606,13 @@ void display_enter(void)
                " "
        );
 
-       wprintf("<input type=\"submit\" name=\"sc\" value=\"Save message\">"
-               "&nbsp;"
+       wprintf("<input type=\"submit\" name=\"sc\" value=\"");
+       if (strlen(bstr("recp")) > 0) {
+               wprintf("Send message");
+       } else {
+               wprintf("Post message");
+       }
+       wprintf("\">&nbsp;"
                "<input type=\"submit\" name=\"sc\" value=\"Cancel\">\n");
 
        /* begin richedit box */

diff --git a/webcit/paging.c b/webcit/paging.c
index 5357250dae6ca6decf7823b4562171d7694cfc4b..757921b4c9ffbe2eb58345b8c5b9ed48a2058470 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -36,10 +36,19 @@ void display_page(void)
 
        strcpy(recp, bstr("recp"));
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-
-       svprintf("BOXTITLE", WCS_STRING, "Page: %s", recp);
-       do_template("beginbox");
+        output_headers(1, 1, 2, 0, 0, 0, 0);
+        wprintf("<div id=\"banner\">\n"
+                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<SPAN CLASS=\"titlebar\">Send instant message</SPAN>"
+                "</TD></TR></TABLE>\n"
+                "</div>\n<div id=\"content\">\n"
+        );
+                                                                                                                             
+        wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
+
+       wprintf("Send an instant message to: ");
+       escputs(recp);
+       wprintf("<br>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/page_user\">\n");
 
@@ -64,7 +73,7 @@ void display_page(void)
        wprintf("<br /><A HREF=\"javascript:window.close();\"Cancel</A>\n");
 
        wprintf("</FORM></CENTER>\n");
-       do_template("endbox");
+       wprintf("</td></tr></table></center>\n");
        wDumpContent(1);
 }
 
@@ -78,8 +87,14 @@ void page_user(void)
        char buf[SIZ];
        char closewin[SIZ];
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-
+        output_headers(1, 1, 2, 0, 0, 0, 0);
+        wprintf("<div id=\"banner\">\n"
+                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<SPAN CLASS=\"titlebar\">Add or edit an event</SPAN>"
+                "</TD></TR></TABLE>\n"
+                "</div>\n<div id=\"content\">\n"
+        );
+                                                                                                                             
        strcpy(recp, bstr("recp"));
        strcpy(sc, bstr("sc"));
        strcpy(closewin, bstr("closewin"));

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 2d628e265e9f3a29d83cc2e77b78901e4801d23e..56e8fe65fc151092b21e3e1e5dae67fe5d6ea4b7 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -386,7 +386,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                "<td>"
                                "<A HREF=\"/readnew\">"
                                "<img align=\"middle\" src=\"/static/readmsgs.gif\" border=\"0\">"
-                               "<span class=\"navbar_link\">New messages</span></A>"
+                               "<span class=\"navbar_link\">Read new messages</span></A>"
                                "</td>\n"
                        );
                }
@@ -453,7 +453,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                                "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
-                                               "All messages"
+                                               "Read all messages"
                                                "</span></a></td>\n"
                                        );
                                        break;
@@ -489,7 +489,8 @@ void embed_room_banner(char *got, int navbar_style) {
 
                if (navbar_style == navbar_default) wprintf(
                        "<td>"
-                       "<A HREF=\"/skip\">"
+                       "<A HREF=\"/skip\" "
+                       "TITLE=\"Leave all messages marked as unread, go to next room with unread messages\">"
                        "<span class=\"navbar_link\">Skip this room</span>"
                        "<img align=\"middle\" src=\"/static/forward.gif\" border=\"0\"></A>"
                        "</td>\n"
@@ -497,7 +498,8 @@ void embed_room_banner(char *got, int navbar_style) {
 
                if (navbar_style == navbar_default) wprintf(
                        "<td>"
-                       "<A HREF=\"/gotonext\">"
+                       "<A HREF=\"/gotonext\" "
+                       "TITLE=\"Mark all messages as read, go to next room with unread messages\">"
                        "<span class=\"navbar_link\">Goto next room</span>"
                        "<img align=\"middle\" src=\"/static/forward.gif\" border=\"0\"></A>"
                        "</td>\n"
@@ -1664,9 +1666,16 @@ void display_entroom(void)
                display_main_menu();
                return;
        }
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-       svprintf("BOXTITLE", WCS_STRING, "Create a new room");
-       do_template("beginbox");
+
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Create a new room</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/entroom\">\n");
 
@@ -1685,6 +1694,16 @@ void display_entroom(void)
                 }
         wprintf("</SELECT>\n");
 
+       wprintf("<LI>Default view for room: ");
+        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\">\n");
+       for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
+               wprintf("<OPTION %s VALUE=\"%d\">",
+                       ((i == 0) ? "SELECTED" : ""), i );
+               escputs(viewdefs[i]);
+               wprintf("</OPTION>\n");
+       }
+       wprintf("</SELECT>\n");
+
        wprintf("<LI>Type of room:<UL>\n");
 
        wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
@@ -1704,16 +1723,6 @@ void display_entroom(void)
        wprintf("> Personal (mailbox for you only)\n");
        wprintf("</UL>\n");
 
-       wprintf("<LI>Default view for room: "); /* FOO */
-        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\">\n");
-       for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               wprintf("<OPTION %s VALUE=\"%d\">",
-                       ((i == 0) ? "SELECTED" : ""), i );
-               escputs(viewdefs[i]);
-               wprintf("</OPTION>\n");
-       }
-       wprintf("</SELECT>\n");
-
        wprintf("<CENTER>\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("&nbsp;");
@@ -1725,7 +1734,7 @@ void display_entroom(void)
        if (buf[0] == '1') {
                fmout(NULL, "CENTER");
        }
-       do_template("endbox");
+       wprintf("</td></tr></table></center>\n");
        wDumpContent(1);
 }
 

diff --git a/webcit/setup.c b/webcit/setup.c
index e139514ecd7a52f3a21ab7eac8781a3d978125e6..8b6cb3828849923e9be686b9dc182f120ed6a734 100644 (file)
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -39,7 +39,7 @@ int setup_type;
 char setup_directory[SIZ];
 char init_entry[SIZ];
 int using_web_installer = 0;
-
+char suggested_url[SIZ];
 
 /*
  * Set an entry in inittab to the desired state
@@ -466,6 +466,7 @@ void check_inittab_entry(void)
 #endif
        char hostname[128];
        char portname[128];
+       struct utsname my_utsname;
 
        /* Determine the fully qualified path name of webserver */
        snprintf(looking_for, sizeof looking_for, "%s/webserver", setup_directory);
@@ -490,6 +491,8 @@ void check_inittab_entry(void)
                "select another port.");
        sprintf(http_port, "2000");
        set_value(question, http_port);
+       uname(&my_utsname);
+       sprintf(suggested_url, "http://%s:%s/", my_utsname.nodename, http_port);
 
 #ifdef HAVE_OPENSSL
        snprintf(question, sizeof question,
@@ -591,8 +594,9 @@ int discover_ui(void)
 int main(int argc, char *argv[])
 {
        int a;
-       char aaa[128];
+       char aaa[256];
        int info_only = 0;
+       strcpy(suggested_url, "http://<your_host_name>:<port>/");
 
        /* set an invalid setup type */
        setup_type = (-1);
@@ -670,8 +674,10 @@ int main(int argc, char *argv[])
                        if (a == 0) start_the_service();
                        sleep(1);
                }
-               important_message("Setup finished",
-                       "Setup is finished.  You may now log in.");
+               sprintf(aaa,
+                       "Setup is finished.  You may now log in.\n"
+                       "Point your web browser at %s\n", suggested_url);
+               important_message("Setup finished", aaa);
        }
        else {
                important_message("Setup finished",

diff --git a/webcit/static/head.html b/webcit/static/head.html
index 9423c13a212089cbf2cc8f67e478bc718bf716f4..e4753ffc5c5fe0b6679a71249692ba672b843bf6 100644 (file)
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -32,7 +32,7 @@ body {
        left:0px;
        width: 15%;
        height:100%;
-       background: #ffffff;
+       background: #eeeecc;
 }
 
 * html #iconbar {
@@ -99,7 +99,7 @@ body {
        width: 100%;
        padding: 0 0 1em 0;
        margin-bottom: 1em;
-       background-color: #ffffff;
+       background-color: #eeeecc;
        color: #aaaaaa;
        font-size: 8pt;
 }
@@ -124,7 +124,7 @@ body {
 
 #button li a {
        display: block;
-       background-color: #FFFFFF;
+       background-color: #eeeecc;
        color: #000000;
        text-decoration: none;
        width: 100%;
@@ -135,8 +135,8 @@ html>body #button li a {
 }
 
 #button li a:hover {
-       background-color: #aaaaaa;
-       color: #fff;
+       background-color: #ddddff;
+       color: #000000;
 }
 
 a:link {
@@ -292,6 +292,7 @@ var sub {
 .errormsg {
        color: #AA0000;
        background: none;
+       font-weight: bold;
        font-style: italic;
 }
 

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 46fb4d28a4b25711e17cc0cd09edaf00d3635049..a1927f0d03a934991b82b9326672b8ee23889b94 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -52,6 +52,22 @@ void select_user_to_edit(char *message, char *preselect)
 
        wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP><TD>\n");
 
+       svprintf("BOXTITLE", WCS_STRING, "Add users");
+       do_template("beginbox");
+
+       wprintf("To create a new user account, enter the desired "
+               "user name in the box below and click 'Create'.<br /><br />");
+
+        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/create_user\">\n");
+        wprintf("New user: ");
+        wprintf("<input type=text name=username><br />\n"
+               "<input type=submit value=\"Create\">"
+               "</FORM></CENTER>\n");
+
+       do_template("endbox");
+
+       wprintf("</TD><TD>");
+
        svprintf("BOXTITLE", WCS_STRING, "Edit or Delete users");
        do_template("beginbox");
 
@@ -84,21 +100,6 @@ void select_user_to_edit(char *message, char *preselect)
         wprintf("</FORM></CENTER>\n");
        do_template("endbox");
 
-       wprintf("</TD><TD>");
-
-       svprintf("BOXTITLE", WCS_STRING, "Add users");
-       do_template("beginbox");
-
-       wprintf("To create a new user account, enter the desired "
-               "user name in the box below and click 'Create'.<br /><br />");
-
-        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/create_user\">\n");
-        wprintf("New user: ");
-        wprintf("<input type=text name=username><br />\n"
-               "<input type=submit value=\"Create\">"
-               "</FORM></CENTER>\n");
-
-       do_template("endbox");
        wprintf("</TD></TR></TABLE>\n");
 
        wDumpContent(1);

diff --git a/webcit/userlist.c b/webcit/userlist.c
index a0ddc8e22e895cac2c2c2d63937173c9d337b018..4578f048190d0e9ee12d47b9544f62ead420c2c6 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -124,12 +124,18 @@ void showuser(void)
        char buf[SIZ];
        int have_pic;
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
+       strcpy(who, bstr("who"));
+
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">User profile</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
 
-       svprintf("BOXTITLE", WCS_STRING, "User profile");
-       do_template("beginbox");
+       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
 
-       strcpy(who, bstr("who"));
        serv_printf("OIMG _userpic_|%s", who);
        serv_gets(buf);
        if (buf[0] == '2') {
@@ -157,9 +163,10 @@ void showuser(void)
        wprintf("\">"
                "<IMG SRC=\"/static/page.gif\" ALIGN=MIDDLE BORDER=0>"
                "&nbsp;&nbsp;"
-               "Click here to page this user (send an instant message)"
-               "</A>\n");
+               "Click here to send an instant message to ");
+       escputs(who);
+       wprintf("</A>\n");
 
-       do_template("endbox");
+       wprintf("</td></tr></table></center>\n");
        wDumpContent(1);
 }

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index f8be5b9a1c95ee813dd55c33feb77c2472b31262..d28bd47c20b6c138824cd330e3aa53601482e2ac 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -256,7 +256,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        escputs(primary_inetemail);
        wprintf("\"><br />"
                "</TD><TD VALIGN=TOP>"
-               "Other Internet e-mail addresses<br />"
+               "Internet e-mail aliases<br />"
                "<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
        escputs(other_inetemail);
        wprintf("</TEXTAREA></TD></TR></TABLE><br />\n");

diff --git a/webcit/webcit.c b/webcit/webcit.c
index b96104fdd56acfd91289d09ccb79f07a7d951f35..807c84b667ee30717bfb1174837e72a6b80159a6 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -419,7 +419,6 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers
        if (do_room_banner == 1) {
                wprintf("<div id=\"content\">\n");
 
-
                if (strlen(WC->ImportantMessage) > 0) {
                        do_template("beginbox_nt");
                        wprintf("<SPAN CLASS=\"errormsg\">"