]> code.citadel.org Git - citadel.git/blobdiff - webcit/iconbar.c
Added pager config to tuiconfig.c
[citadel.git] / webcit / iconbar.c
index f82d179ff90f0f25207856efa112a544ff303796..d56d22240b8241f43c1232b02f238f2fc4ef3f8f 100644 (file)
@@ -3,6 +3,7 @@
  */
 /**
  * \defgroup IconBar Displays and customizes the iconbar.
+ * \ingroup MenuInfrastructure
  */
 /*@{*/
 #include "webcit.h"
@@ -80,60 +81,58 @@ void do_iconbar(void) {
                if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
        }
 
-       wprintf("<div id=\"button\">\n"
-               "<ul>\n"
-       );
-
-       if (ib_logo) {
-               wprintf("<li>");
-               if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" "
-                               "HEIGHT=\"32\" src=\"image&name=hello\" ALT=\"&nbsp;\">\n"
-                       );
-               }
-               wprintf("</li>\n");
-       }
-
-       if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
-               "<li><div align=\"center\">"
-               "<a href=\"http://www.citadel.org\" "
-               "title=\"%s\" target=\"aboutcit\">"
-               "<img border=\"0\" "
-               "src=\"static/citadel-logo.gif\" ALT=\"%s\"></a>"
-               "</div></li>\n",
-               _("Find out more about Citadel"),
-               _("CITADEL")
-       );
-
-       wprintf("<li><div align=\"center\"><a href=\"javascript:switch_to_room_list()\">");
+        if (ib_logo) {
+                if (ib_displayas != IB_TEXTONLY) {
+                        wprintf("<div class=\"logo\"> <img "
+                                "src=\"image&name=hello\" alt=\"&nbsp;\"> "
+                                "</div>\n"
+                        );
+                }
+                wprintf("\n");
+        }
+
+        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
+                "<div class=\"logo_citadel\"> "
+                "<a href=\"http://www.citadel.org\" "
+                "title=\"%s\"> "
+                "<img "
+                "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
+                "</div>\n",
+                _("Find out more about Citadel"),
+                _("CITADEL")
+        );
+
+       wprintf("<ul id=\"button\">\n");
+
+       wprintf("<li class=\"switch\"><a href=\"javascript:switch_to_room_list()\">");
        wprintf(_("switch to room list"));
-       wprintf("</a></div>");
+       wprintf("</a></li>");
 
        if (ib_summary) {
                wprintf("<li><a href=\"summary\" "
-                       "TITLE=\"%s\" "
+                       "title=\"%s\" "
                        ">", _("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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if (ib_inbox) {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_MAIL_\" "
-                       "TITLE=\"%s\" "
+                       "title=\"%s\" "
                        ">",
                        _("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"));
@@ -146,106 +145,112 @@ void do_iconbar(void) {
                                WC->remember_new_mail = WC->new_mail;
                        }
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if (ib_calendar) {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_CALENDAR_\" "
-                       "TITLE=\"%s\" "
+                       "title=\"%s\" "
                        ">",
                        _("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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if (ib_contacts) {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_CONTACTS_\" "
-                       "TITLE=\"%s\" "
+                       "title=\"%s\" "
                        ">",
                        _("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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if (ib_notes) {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_NOTES_\" "
-                       "TITLE=\"%s\" "
+                       "title=\"%s\" "
                        ">",
                        _("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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if (ib_tasks)  {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_TASKS_\" "
-                       "TITLE=\"%s\" "
+                       "title=\"%s\" "
                        ">",
                        _("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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if (ib_rooms) {
                wprintf("<li>"
-                       "<a href=\"knrooms\" TITLE=\"%s\" >",
+                       "<a href=\"knrooms\" title=\"%s\" >",
                        _("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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if (ib_users) {
                wprintf("<li>"
-                       "<a href=\"who\" TITLE=\"%s\" "
+                       "<a href=\"who\" title=\"%s\" "
                        ">",
                        _("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) {
@@ -257,76 +262,85 @@ 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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if (ib_advanced) {
                wprintf("<li>"
                        "<a href=\"display_main_menu\" "
-                       "TITLE=\"%s\" "
+                       "title=\"%s\" "
                        ">",
                        _("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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
                wprintf("<li>"
                        "<a href=\"display_aide_menu\" "
-                       "TITLE=\"%s\" "
+                       "title=\"%s\" "
                        ">",
                        _("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"));
                }
-               wprintf("</A></li>\n");
+               wprintf("</a></li>\n");
        }
 
        wprintf("<li>"
-               "<a href=\"termquit\" TITLE=\"%s\" "
+               "<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\">");
+       wprintf("<img  width=\"32\" height=\"32\" "
+               "src=\"static/logoff_32x.gif\" alt=\"%s\">", _("Log off"));
        }
        if (ib_displayas != IB_PICONLY) {
                wprintf(_("Log off"));
        }
-       wprintf("</A></li>\n");
+       wprintf("</a></li>\n");
 
        wprintf(
-               "<li><div align=\"center\">"
+               "<li class=\"switch\">"
                "<a href=\"display_customize_iconbar\" "
-               "TITLE=\"%s\" "
+               "title=\"%s\" "
                ">%s"
-               "</A></div></li>\n",
+               "</a></li>\n",
                _("Customize this menu"),
                _("customize this menu")
        );
 
-       wprintf("</ul></div>\n");
+       wprintf("</ul>\n");
+
+       if (ib_users > 1) {
+               wprintf(
+                       "<script type=\"text/javascript\"> "
+                       " new Ajax.PeriodicalUpdater('wholist', 'wholist_section', { method: 'get', frequency: 30 } );"
+                "</script> \n"
+               );
+       }
+
 }
 
 
@@ -366,52 +380,49 @@ void do_iconbar_roomlist(void) {
                if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
        }
 
-       wprintf("<div id=\"button\">\n"
-               "<ul>\n"
-       );
-
        if (ib_logo) {
-               wprintf("<li>");
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" "
-                               "HEIGHT=\"32\" src=\"image&name=hello\" ALT=\"&nbsp;\">\n"
+                        wprintf("<div class=\"logo\"> <img "
+                                "src=\"image&name=hello\" alt=\"&nbsp;\"> "
+                                "</div>\n"
                        );
                }
-               wprintf("</li>\n");
        }
 
-       if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
-               "<li><div align=\"center\">"
-               "<a href=\"http://www.citadel.org\" "
-               "title=\"%s\" target=\"aboutcit\">"
-               "<img border=\"0\" "
-               "src=\"static/citadel-logo.gif\" ALT=\"%s\"></a>"
-               "</div></li>\n",
-               _("Find out more about Citadel"),
-               _("CITADEL")
-       );
+        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
+                "<div class=\"logo_citadel\"> "
+                "<a href=\"http://www.citadel.org\" "
+                "title=\"%s\"> "
+                "<img "
+                "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
+                "</div>\n",
+                _("Find out more about Citadel"),
+                _("CITADEL")
+        );
 
-       wprintf("<li><div align=\"center\"><a href=\"javascript:switch_to_menu_buttons()\">");
+       wprintf("<ul id=\"button\">\n");
+
+       wprintf("<li class=\"switch\"><a href=\"javascript:switch_to_menu_buttons()\">");
        wprintf(_("switch to menu"));
-       wprintf("</a></div>");
+       wprintf("</a></li>");
 
        wprintf("<li>"
-               "<a href=\"termquit\" TITLE=\"%s\" "
+               "<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\" "
+       wprintf("<img  width=\"32\" height=\"32\" "
                "src=\"static/logoff_32x.gif\">");
        }
        if (ib_displayas != IB_PICONLY) {
                wprintf(_("Log off"));
        }
-       wprintf("</A></li>\n");
+       wprintf("</a></li>\n");
 
-       wprintf("</ul></div>\n");
+       wprintf("</ul>\n");
 
        /** embed the room list */
        list_all_rooms_by_floor("iconbar");
@@ -474,25 +485,24 @@ void display_customize_iconbar(void) {
        }
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><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 id=\"content\" class=\"service\">\n");
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
+       wprintf("<div class=\"fix_scrollbar_bug\">");
 
-       wprintf("<FORM METHOD=\"POST\" action=\"commit_iconbar\">\n");
+       wprintf("<form method=\"post\" action=\"commit_iconbar\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
-       wprintf("<CENTER>");
+       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);
+               wprintf("<input type=\"radio\" name=\"ib_displayas\" value=\"%d\"", i);
                if (ib_displayas == i) wprintf(" CHECKED");
                wprintf(">");
                if (i == IB_PICTEXT)    wprintf(_("pictures and text"));
@@ -500,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("<TR BGCOLOR=%s><TD>"
-               "<INPUT TYPE=\"checkbox\" NAME=\"ib_logo\" VALUE=\"yes\" %s>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"image&name=hello\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       wprintf("</td></tr>\n");
+
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/summscreen_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/privatemess_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/viewcontacts_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/storenotes_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/calarea_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/taskmanag_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/chatrooms_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/usermanag_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
-               "%s"
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_users ? "CHECKED" : ""),
+       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 src=\"static/usermanag_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b>"
+               "<br />%s"
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/citadelchat_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/advanpage2_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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 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" : ""),
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "src=\"static/citadel-logo.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>%s</B><br />"
+       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  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" : ""),
+               "</td></tr>\n",
+               (bar ? "even" : "odd"),
+               (ib_citadel ? "CHECKED" : ""),_("Yes"),
+               (!ib_citadel ? "CHECKED" : ""),_("No"),
                _("Citadel logo"),
                _("Displays the 'Powered by Citadel' icon")
        );
 
-       wprintf("</TABLE><br />\n"
-               "<CENTER>"
-               "<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
+       wprintf("</table><br />\n"
+               "<center>"
+               "<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
                "&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
-               "</CENTER></FORM>\n",
+               "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
+               "</center>\n",
                _("Save changes"),
                _("Cancel")
        );
 
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</form></div>\n");
        wDumpContent(2);
 }
 
@@ -738,7 +768,7 @@ void commit_iconbar(void) {
                "ib_citadel"
        };
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (IsEmptyStr(bstr("ok_button"))) {
                display_main_menu();
                return;
        }
@@ -746,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\">"