*** empty log message ***

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 0456c341b99d9fbdea7dfa729dfd8f77c06c0851..277bc75a5ff023a998125f4d59d9049ed5817b7c 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -94,6 +94,17 @@ void do_iconbar(void) {
                wprintf("</li>\n");
        }
 
+       if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
+               "<li><div align=\"center\">"
+               "<A HREF=\"http://www.citadel.org\" "
+               "title=\"Find out more about Citadel\" target=\"aboutcit\" "
+               "<img border=\"0\" width=\"48\" height=\"48\" "
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\">"
+               "CITADEL</A>"
+               "</div></li>\n"
+       );
+
+
        if (ib_summary) {
                wprintf("<li><A HREF=\"/summary\" "
                        "TITLE=\"Your summary page\" "
@@ -293,18 +304,6 @@ void do_iconbar(void) {
                "</A></div></li>\n"
        );
 
-       if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
-               "<li><div align=\"center\">"
-               "<A HREF=\"http://www.citadel.org\" "
-               "title=\"Find out more about Citadel\" target=\"aboutcit\" "
-               "onMouseOver=\"window.status='Find out more about "
-               "Citadel'; return true;\">powered by<br /><IMG "
-               "BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\">"
-               "<br />CITADEL</A>"
-               "</div></li>\n"
-       );
-
        wprintf("</ul>\n"
                "</div>\n");
 }

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 630007f350798f97290d221edeaa0d8ed32fd0c5..87f3f15da76282523a77a34599b150bd105ff6b7 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -202,14 +202,32 @@ void display_aide_menu(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<center><table border=1 cellpadding=5 bgcolor=\"#ffffff\"><tr><td>\n");
+       wprintf("<center><table border=0 width=99%%><tr valign=top><td>");
+
+       svprintf("BOXTITLE", WCS_STRING, "Global Configuration");
+       do_template("beginbox");
 
        wprintf("<A HREF=\"/display_siteconfig\">"
                "<span class=\"mainmenu\">"
-               "Edit site-wide configuration</span></A>\n");
+               "Edit site-wide configuration</span></A><br />\n");
+
+       wprintf("<A HREF=\"/display_inetconf\">"
+               "<span class=\"mainmenu\">"
+               "Domain names and Internet mail configuration</span></a><br />\n");
+
+       wprintf("<A HREF=\"/display_netconf\">"
+               "<span class=\"mainmenu\">"
+               "Configure replication with other Citadel servers"
+               "</span></A>\n");
+
+       do_template("endbox");
+
+       wprintf("</td><td>");
+
+       svprintf("BOXTITLE", WCS_STRING, "User account management");
+       do_template("beginbox");
 
-       wprintf("<br />"
-               "<A HREF=\"/select_user_to_edit\">"
+       wprintf("<A HREF=\"/select_user_to_edit\">"
                "<span class=\"mainmenu\">"
                "Add, change, delete user accounts"
                "</span></A><br />\n");
@@ -218,19 +236,17 @@ void display_aide_menu(void)
                "<span class=\"mainmenu\">"
                "Validate new users</span></A><br />\n");
 
+       do_template("endbox");
+
+       svprintf("BOXTITLE", WCS_STRING, "Rooms and Floors");
+       do_template("beginbox");
+
        wprintf("<A HREF=\"/display_floorconfig\">"
                "<span class=\"mainmenu\">"
                "Add, change, or delete floors"
-               "</span></A><br />\n");
-
-       wprintf("<A HREF=\"/display_netconf\">"
-               "<span class=\"mainmenu\">"
-               "Configure networking with other systems"
-               "</span></A><br />\n");
+               "</span></A>\n");
 
-       wprintf("<A HREF=\"/display_inetconf\">"
-               "<span class=\"mainmenu\">"
-               "Internet and domain configuration</span></a><br />\n");
+       do_template("endbox");
 
        wprintf("</td></tr></table></center>");
        wDumpContent(2);

diff --git a/webcit/static/head.html b/webcit/static/head.html
index e4753ffc5c5fe0b6679a71249692ba672b843bf6..85a6cab0c9ca5332cf1ebca9f9967010fef50ffd 100644 (file)
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <?REFRESHTAG>
-<title>Citadel: <?SERV_HUMANNODE></title>
+<title><?SERV_HUMANNODE></title>
 <meta http-equiv="Pragma" content="no-cache" />
 <meta http-equiv="expired" content="28-May-1971 18:10:00 GMT" />
 <meta name="MSSmartTagsPreventParsing" content="TRUE" />