* Minor UI tweaks

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index b1655e338981af86608c1889d76be5e245a79856..9a8d4fc27f6fcc3e6720b56864f99f7ff3ef4788 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 522.2  2004/06/22 02:21:56  ajc
+* Minor UI tweaks
+
 Revision 522.1  2004/06/21 15:00:52  ajc
 * minor CSS changes
 
@@ -1919,4 +1922,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/mainmenu.c b/webcit/mainmenu.c
index d2c4f65f4b15dfab4aa2d659917f7b5cdd14a751..18eca1afb38df1347bb651951ed9d1fa4d93926f 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -163,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");
 
@@ -191,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");
@@ -220,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");

diff --git a/webcit/roomops.c b/webcit/roomops.c
index f06119c7f9eb61da437456656bc4d878786e41bf..e76987659ed06bb71218c3378197a17f99f12008 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1267,7 +1267,9 @@ void editroom(void)
                        return;
                }
        }
-       smart_goto(er_name);
+       gotoroom(er_name, 0);
+       display_main_menu();
+       return;
 }
 
 /*