* Completed web screens for THE DREADED AUTO-PURGER by adding room and

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index a00168b1d702bc3e1d2f41e075a52936b395daa2..077d608d1dd049378eb54ac5150757736451940b 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -141,9 +141,16 @@ void display_main_menu(void)
                "</span><BR>\n"
        );
 
-       wprintf("<A HREF=\"/chat\">"
+       wprintf("<A HREF=\"#\" onClick=\"window.open('/chat', "
+               "'ctdl_chat_window', "
+               "'toolbar=no,location=no,directories=no,copyhistory=no,"
+               "status=no,scrollbars=yes,resizable=yes');\""
+               ">"
                "<span class=\"mainmenu\">"
-               "Chat with other online users</span></A><BR>\n");
+               "Chat with other users in <i>"
+       );
+       escputs(WC->wc_roomname);
+       wprintf("</i></span></A><BR>\n");
 
        wprintf("<A HREF=\"/display_generic\">\n");
        wprintf("<span class=\"menudesc\">"
@@ -156,26 +163,26 @@ void display_main_menu(void)
        svprintf("BOXTITLE", WCS_STRING, "Your info");
        do_template("beginbox");
 
-       wprintf("<A HREF=\"/display_editbio\">"
+       wprintf("<A HREF=\"/display_reg\">"
                "<span class=\"mainmenu\">"
-               "Enter your 'bio' "
+               "Update your contact information "
                "</span><span class=\"menudesc\">"
-               "(a few words about yourself)"
-               "</span></A><BR>\n");
+               "(name, address, etc.)</span></A><BR>\n");
 
-       wprintf("<A HREF=\"/display_editpic\">"
+       wprintf("<A HREF=\"/display_changepw\">"
                "<span class=\"mainmenu\">"
-               "Edit your online photo</span></a><BR>\n");
+               "Change your password</span></A><BR>\n");
 
-       wprintf("<A HREF=\"/display_reg\">"
+       wprintf("<A HREF=\"/display_editbio\">"
                "<span class=\"mainmenu\">"
-               "Re-enter your registration info "
+               "Enter your 'bio' "
                "</span><span class=\"menudesc\">"
-               "(name, address, etc.)</span></A><BR>\n");
+               "(a few words about yourself)"
+               "</span></A><BR>\n");
 
-       wprintf("<A HREF=\"/display_changepw\">"
+       wprintf("<A HREF=\"/display_editpic\">"
                "<span class=\"mainmenu\">"
-               "Change your password</span></A>\n");
+               "Edit your online photo</span></a>\n");
 
        do_template("endbox");
 
@@ -184,6 +191,12 @@ void display_main_menu(void)
        svprintf("BOXTITLE", WCS_STRING, "Advanced room commands");
        do_template("beginbox");
 
+       if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
+               wprintf("<A HREF=\"/display_editroom\">"
+                       "<span class=\"mainmenu\">"
+                       "Edit or delete this room</span></A><BR>\n");
+       }
+
        wprintf("<A HREF=\"/display_private\">"
                "<span class=\"mainmenu\">"
                "Go to a &quot;hidden&quot; room</span></A><BR>\n");
@@ -213,10 +226,6 @@ void display_main_menu(void)
                svprintf("BOXTITLE", WCS_STRING, "Administrative functions");
                do_template("beginbox");
 
-               wprintf("<A HREF=\"/display_editroom\">"
-                       "<span class=\"mainmenu\">"
-                       "Edit or delete this room</span></A><BR>\n");
-
                wprintf("<A HREF=\"/display_siteconfig\">"
                        "<span class=\"mainmenu\">"
                        "Edit site-wide configuration</span></A>\n");
@@ -278,6 +287,7 @@ void display_generic(void)
        wprintf("<FONT SIZE=-2>Detected host header is http://%s</FONT>\n",
                WC->http_host);
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Send command\">");
+       wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
 
        wprintf("</FORM></CENTER>\n");