]> code.citadel.org Git - citadel.git/blobdiff - webcit/iconbar.c
Added pager config to tuiconfig.c
[citadel.git] / webcit / iconbar.c
index b1c175eecc81cd1e815e6f3bae63e1e037c6614e..d56d22240b8241f43c1232b02f238f2fc4ef3f8f 100644 (file)
@@ -94,7 +94,7 @@ void do_iconbar(void) {
         if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
                 "<div class=\"logo_citadel\"> "
                 "<a href=\"http://www.citadel.org\" "
-                "title=\"%s\" target=\"aboutcit\"> "
+                "title=\"%s\"> "
                 "<img "
                 "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
                 "</div>\n",
@@ -114,8 +114,8 @@ void do_iconbar(void) {
                        ">", _("Your summary page")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                               "src=\"static/summscreen_32x.gif\">");
+                       wprintf("<img width=\"32\" height=\"32\" "
+                               "src=\"static/summscreen_32x.gif\" alt=\"%s\">", _("Summary"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Summary"));
@@ -131,8 +131,8 @@ void do_iconbar(void) {
                        _("Go to your email inbox")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                               "src=\"static/privatemess_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                               "src=\"static/privatemess_32x.gif\" alt=\"%s\">", _("Mail"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Mail"));
@@ -156,8 +156,8 @@ void do_iconbar(void) {
                        _("Go to your personal calendar")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/calarea_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/calarea_32x.gif\" alt=\"%s\">", _("Calendar"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Calendar"));
@@ -173,8 +173,8 @@ void do_iconbar(void) {
                        _("Go to your personal address book")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/viewcontacts_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/viewcontacts_32x.gif\" alt=\"%s\">", _("Contacts"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Contacts"));
@@ -190,8 +190,8 @@ void do_iconbar(void) {
                        _("Go to your personal notes")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/storenotes_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/storenotes_32x.gif\" alt=\"%s\">", _("Notes"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Notes"));
@@ -207,8 +207,8 @@ void do_iconbar(void) {
                        _("Go to your personal task list")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/taskmanag_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/taskmanag_32x.gif\" alt=\"%s\">", _("Tasks"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Tasks"));
@@ -222,8 +222,8 @@ void do_iconbar(void) {
                        _("List all of your accessible rooms")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/chatrooms_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/chatrooms_32x.gif\" alt=\"%s\">", _("Rooms"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Rooms"));
@@ -238,13 +238,19 @@ void do_iconbar(void) {
                        _("See who is online right now")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/usermanag_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/usermanag_32x.gif\" alt=\"%s\">", _("Who is online?"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Who is online?"));
                }
-               wprintf("</a></li>\n");
+                
+               wprintf("</a>\n");
+
+               if (ib_users > 1) {
+                       wprintf("<ul id=\"wholist\">");
+                       wprintf("</ul></li>\n");
+               }
        }
 
        if (ib_chat) {
@@ -256,8 +262,8 @@ void do_iconbar(void) {
                        ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/citadelchat_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/citadelchat_32x.gif\" alt=\"%s\">", _("Chat"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Chat"));
@@ -273,8 +279,8 @@ void do_iconbar(void) {
                        _("Advanced Options Menu: Advanced Room commands, Account Info, and Chat")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/advanpage2_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/advanpage2_32x.gif\" alt=\"%s\">", _("Advanced"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Advanced"));
@@ -290,8 +296,8 @@ void do_iconbar(void) {
                        _("Room and system administration functions")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-                       "src=\"static/advanpage2_32x.gif\">");
+                       wprintf("<img  width=\"32\" height=\"32\" "
+                       "src=\"static/advanpage2_32x.gif\" alt=\"%s\">", _("Administration"));
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Administration"));
@@ -307,8 +313,8 @@ void do_iconbar(void) {
                
        );
        if (ib_displayas != IB_TEXTONLY) {
-       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
-               "src=\"static/logoff_32x.gif\">");
+       wprintf("<img  width=\"32\" height=\"32\" "
+               "src=\"static/logoff_32x.gif\" alt=\"%s\">", _("Log off"));
        }
        if (ib_displayas != IB_PICONLY) {
                wprintf(_("Log off"));
@@ -326,6 +332,15 @@ void do_iconbar(void) {
        );
 
        wprintf("</ul>\n");
+
+       if (ib_users > 1) {
+               wprintf(
+                       "<script type=\"text/javascript\"> "
+                       " new Ajax.PeriodicalUpdater('wholist', 'wholist_section', { method: 'get', frequency: 30 } );"
+                "</script> \n"
+               );
+       }
+
 }
 
 
@@ -377,7 +392,7 @@ void do_iconbar_roomlist(void) {
         if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
                 "<div class=\"logo_citadel\"> "
                 "<a href=\"http://www.citadel.org\" "
-                "title=\"%s\" target=\"aboutcit\"> "
+                "title=\"%s\"> "
                 "<img "
                 "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
                 "</div>\n",
@@ -399,7 +414,7 @@ void do_iconbar_roomlist(void) {
                
        );
        if (ib_displayas != IB_TEXTONLY) {
-       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+       wprintf("<img  width=\"32\" height=\"32\" "
                "src=\"static/logoff_32x.gif\">");
        }
        if (ib_displayas != IB_PICONLY) {
@@ -470,23 +485,22 @@ void display_customize_iconbar(void) {
        }
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"iconbar_banner\"><tr><td>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">");
+       wprintf("<h1>");
        wprintf(_("Customize the icon bar"));
-       wprintf("</SPAN>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1></div>\n");
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"iconbar_background\"><tr><td>");
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
-       wprintf("<FORM METHOD=\"POST\" action=\"commit_iconbar\">\n");
+       wprintf("<div class=\"fix_scrollbar_bug\">");
 
-       wprintf("<CENTER>");
+       wprintf("<form method=\"post\" action=\"commit_iconbar\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+
+       wprintf("<table class=\"altern\" >\n");
+       wprintf("<tr><td></td><td colspan=\"2\"><b>");
        wprintf(_("Display icons as:"));
-       wprintf(" ");
+       wprintf("</b>");
        for (i=0; i<=2; ++i) {
                wprintf("<input type=\"radio\" name=\"ib_displayas\" value=\"%d\"", i);
                if (ib_displayas == i) wprintf(" CHECKED");
@@ -496,218 +510,238 @@ void display_customize_iconbar(void) {
                if (i == IB_TEXTONLY)   wprintf(_("text only"));
                wprintf("\n");
        }
-       wprintf("<br /><br />\n");
+       wprintf("<br />\n");
 
        wprintf(_("Select the icons you would like to see displayed "
                "in the 'icon bar' menu on the left side of the "
                "screen."));
-       wprintf("</CENTER><br />\n");
-
-       wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+       wprintf("</td></tr>\n");
 
-       wprintf("<tr BGCOLOR=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_logo\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_logo\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_logo\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" "
-               "src=\"image&name=hello\" alt=\"&nbsp;\">"
+               "<img src=\"image&name=hello\" width=\"48\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_logo ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_logo ? "CHECKED" : ""),_("Yes"),
+               (!ib_logo ? "CHECKED" : ""),_("No"),
                _("Site logo"),
                _("An icon describing this site")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_summary\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_summary\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_summary\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/summscreen_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/summscreen_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_summary ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_summary ? "CHECKED" : ""),_("Yes"),
+               (!ib_summary ? "CHECKED" : ""),_("No"),
                _("Summary"),
                _("Your summary page")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_inbox\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_inbox\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_inbox\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/privatemess_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/privatemess_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_inbox ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_inbox ? "CHECKED" : ""),_("Yes"),
+               (!ib_inbox ? "CHECKED" : ""),_("No"),
                _("Mail (inbox)"),
                _("A shortcut to your email Inbox")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_contacts\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_contacts\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_contacts\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/viewcontacts_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/viewcontacts_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_contacts ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_contacts ? "CHECKED" : ""),_("Yes"),
+               (!ib_contacts ? "CHECKED" : ""),_("No"),
                _("Contacts"),
                _("Your personal address book")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_notes\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_notes\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_notes\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/storenotes_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/storenotes_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_notes ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_notes ? "CHECKED" : ""),_("Yes"),
+               (!ib_notes ? "CHECKED" : ""),_("No"),
                _("Notes"),
                _("Your personal notes")
        );
 
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_calendar\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_calendar\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_calendar\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/calarea_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/calarea_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_calendar ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_calendar ? "CHECKED" : ""),_("Yes"),
+               (!ib_calendar ? "CHECKED" : ""),_("No"),
                _("Calendar"),
                _("A shortcut to your personal calendar")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_tasks\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_tasks\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_tasks\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/taskmanag_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/taskmanag_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_tasks ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_tasks ? "CHECKED" : ""),_("Yes"),
+               (!ib_tasks ? "CHECKED" : ""),_("No"),
                _("Tasks"),
                _("A shortcut to your personal task list")
        );
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_rooms\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_rooms\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_rooms\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/chatrooms_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/chatrooms_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_rooms ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_rooms ? "CHECKED" : ""),_("Yes"),
+               (!ib_rooms ? "CHECKED" : ""),_("No"),
                _("Rooms"),
                _("Clicking this icon displays a list of all accessible "
                "rooms (or folders) available.")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_users\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_users\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_users\" value=\"no\" %s> %s <br />"
+               "<input type=\"radio\" name=\"ib_users\" value=\"yeslist\" %s> %s"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/usermanag_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/usermanag_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
-               "<b>%s</b><br />"
-               "%s"
+               "<b>%s</b>"
+               "<br />%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_users ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_users ? "CHECKED" : ""),_("Yes"),
+               (!ib_users ? "CHECKED" : ""),_("No"),
+               ((ib_users > 1) ? "CHECKED" : ""),_("Yes with users list"),
                _("Who is online?"),
                _("Clicking this icon displays a list of all users "
                "currently logged in.")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_chat\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_chat\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_chat\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/citadelchat_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/citadelchat_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_chat ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_chat ? "CHECKED" : ""),_("Yes"),
+               (!ib_chat ? "CHECKED" : ""),_("No"),
                _("Chat"),
                _("Clicking this icon enters real-time chat mode "
                "with other users in the same room.")
                
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_advanced\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_advanced\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_advanced\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/advanpage2_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/advanpage2_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_advanced ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_advanced ? "CHECKED" : ""),_("Yes"),
+               (!ib_advanced ? "CHECKED" : ""),_("No"),
                _("Advanced options"),
                _("Access to the complete menu of Citadel functions.")
 
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_citadel\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_citadel\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_citadel\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
+               "<img  width=\"48\" height=\"48\" "
                "src=\"static/citadel-logo.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_citadel ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (ib_citadel ? "CHECKED" : ""),_("Yes"),
+               (!ib_citadel ? "CHECKED" : ""),_("No"),
                _("Citadel logo"),
                _("Displays the 'Powered by Citadel' icon")
        );
 
        wprintf("</table><br />\n"
-               "<CENTER>"
+               "<center>"
                "<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
                "&nbsp;"
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
-               "</CENTER></FORM>\n",
+               "</center>\n",
                _("Save changes"),
                _("Cancel")
        );
 
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</form></div>\n");
        wDumpContent(2);
 }
 
@@ -734,7 +768,7 @@ void commit_iconbar(void) {
                "ib_citadel"
        };
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (IsEmptyStr(bstr("ok_button"))) {
                display_main_menu();
                return;
        }
@@ -742,18 +776,28 @@ void commit_iconbar(void) {
        sprintf(iconbar, "ib_displayas=%d", atoi(bstr("ib_displayas")));
 
        for (i=0; i<(sizeof(boxen)/sizeof(char *)); ++i) {
-               sprintf(&iconbar[strlen(iconbar)], ",%s=", boxen[i]);
+               char *Val;
                if (!strcasecmp(bstr(boxen[i]), "yes")) {
-                       sprintf(&iconbar[strlen(iconbar)], "1");
+                       Val = "1";
+               }
+               else if (!strcasecmp(bstr(boxen[i]), "yeslist")) {
+                       Val = "2";
                }
                else {
-                       sprintf(&iconbar[strlen(iconbar)], "0");
+                       Val = "0";
                }
+               sprintf(&iconbar[strlen(iconbar)], ",%s=%s", boxen[i], Val);
        }
 
        set_preference("iconbar", iconbar, 1);
 
-       output_headers(1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
+       wprintf(_("Customize the icon bar"));
+       wprintf("</h1></div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
        wprintf(
                "<center><table border=1 bgcolor=\"#ffffff\"><tr><td>"
                "<img src=\"static/advanpage2_48x.gif\">"