* fix_scrollbar_bug is now a class instead of an id. Fixes validator warnings.

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index f1d4c8ed43291f958f936f55ab2140f9448d7569..dc18455d6da28f65605a0ce1fc1000822b9c3de0 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -13,12 +13,24 @@
 #define IB_TEXTONLY    2
 
 
+void do_selected_iconbar(void) {
+       if (WC->current_iconbar == current_iconbar_roomlist) {
+               do_iconbar_roomlist();
+       }
+       else {
+               do_iconbar();
+       }
+}
+
+
 void do_iconbar(void) {
        char iconbar[SIZ];
        char buf[SIZ];
        char key[SIZ], value[SIZ];
        int i;
 
+       WC->current_iconbar = current_iconbar_menu;
+
        /* The initialized values of these variables also happen to
         * specify the default values for users who haven't customized
         * their iconbars.  These should probably be set in a master
@@ -86,7 +98,9 @@ void do_iconbar(void) {
                _("CITADEL")
        );
 
-       wprintf("<li><a href=\"javascript:switch_to_room_list()\">switch to room list</a>\n");
+       wprintf("<li><div align=\"center\"><a href=\"javascript:switch_to_room_list()\">");
+       wprintf(_("switch to room list"));
+       wprintf("</a></div>");
 
        if (ib_summary) {
                wprintf("<li><a href=\"summary\" "
@@ -279,23 +293,21 @@ void do_iconbar(void) {
                wprintf("</A></li>\n");
        }
 
-       if (1) {
-               wprintf("<li>"
-                       "<a href=\"termquit\" TITLE=\"%s\" "
-                       "onClick=\"return confirm('%s');\">",
-                       _("Log off"),
-                       _("Log off now?")
-                       
-               );
-               if (ib_displayas != IB_TEXTONLY) {
-               wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "src=\"static/logoff_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf(_("Log off"));
-               }
-               wprintf("</A></li>\n");
+       wprintf("<li>"
+               "<a href=\"termquit\" TITLE=\"%s\" "
+               "onClick=\"return confirm('%s');\">",
+               _("Log off"),
+               _("Log off now?")
+               
+       );
+       if (ib_displayas != IB_TEXTONLY) {
+       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "src=\"static/logoff_32x.gif\">");
+       }
+       if (ib_displayas != IB_PICONLY) {
+               wprintf(_("Log off"));
        }
+       wprintf("</A></li>\n");
 
        wprintf(
                "<li><div align=\"center\">"
@@ -307,13 +319,7 @@ void do_iconbar(void) {
                _("customize this menu")
        );
 
-       wprintf("</ul>\n");
-
-       wprintf("<div id=\"dropstuff\" style=\"font-size:6pt\">");
-       wprintf("Drag to trash here...<br>");
-       wprintf("</div>");
-
-       wprintf("</div>\n");
+       wprintf("</ul></div>\n");
 }
 
 
@@ -327,6 +333,8 @@ void do_iconbar_roomlist(void) {
        char key[SIZ], value[SIZ];
        int i;
 
+       WC->current_iconbar = current_iconbar_roomlist;
+
        /* The initialized values of these variables also happen to
         * specify the default values for users who haven't customized
         * their iconbars.  These should probably be set in a master
@@ -374,17 +382,31 @@ void do_iconbar_roomlist(void) {
                _("CITADEL")
        );
 
-       wprintf("<li><a href=\"javascript:switch_to_menu_buttons()\">back to menu...</a>");
-       
-       wprintf("</ul>\n");
+       wprintf("<li><div align=\"center\"><a href=\"javascript:switch_to_menu_buttons()\">");
+       wprintf(_("switch to menu"));
+       wprintf("</a></div>");
+
+       wprintf("<li>"
+               "<a href=\"termquit\" TITLE=\"%s\" "
+               "onClick=\"return confirm('%s');\">",
+               _("Log off"),
+               _("Log off now?")
+               
+       );
+       if (ib_displayas != IB_TEXTONLY) {
+       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "src=\"static/logoff_32x.gif\">");
+       }
+       if (ib_displayas != IB_PICONLY) {
+               wprintf(_("Log off"));
+       }
+       wprintf("</A></li>\n");
+
+       wprintf("</ul></div>\n");
 
        /* embed the room list */
        list_all_rooms_by_floor("iconbar");
 
-       wprintf("<div id=\"dropstuff\" style=\"font-size:6pt\">");
-       wprintf("Drag to trash here...<br>");
-       wprintf("</div>");
-
        wprintf("</div>\n");
 }
 
@@ -449,7 +471,7 @@ void display_customize_iconbar(void) {
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
 
        wprintf("<FORM METHOD=\"POST\" action=\"commit_iconbar\">\n");