]> code.citadel.org Git - citadel.git/blobdiff - webcit/iconbar.c
* Cleaned up the rcs/cvs Id tags and leading comments at the top of some files
[citadel.git] / webcit / iconbar.c
index 91b2dd5666cf877cf65945c9a732395990cf8d57..36d3b57b01a52243d62c1db5cb6051c97dbb0f76 100644 (file)
@@ -1,4 +1,8 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Displays and customizes the iconbar.
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -40,11 +44,12 @@ void do_iconbar(void) {
         * configuration somewhere.
         */
        int ib_displayas = 0;   /* pictures and text, pictures, text */
-       int ib_logo = 1;        /* Site logo */
+       int ib_logo = 0;        /* Site logo */
        int ib_summary = 0;     /* Summary page icon */
        int ib_inbox = 0;       /* Inbox icon */
        int ib_calendar = 0;    /* Calendar icon */
        int ib_contacts = 0;    /* Contacts icon */
+       int ib_notes = 0;       /* Notes icon */
        int ib_tasks = 0;       /* Tasks icon */
        int ib_rooms = 1;       /* Rooms icon */
        int ib_users = 1;       /* Users icon */
@@ -67,6 +72,7 @@ void do_iconbar(void) {
                if (!strcasecmp(key, "ib_inbox")) ib_inbox = atoi(value);
                if (!strcasecmp(key, "ib_calendar")) ib_calendar = atoi(value);
                if (!strcasecmp(key, "ib_contacts")) ib_contacts = atoi(value);
+               if (!strcasecmp(key, "ib_notes")) ib_notes = atoi(value);
                if (!strcasecmp(key, "ib_tasks")) ib_tasks = atoi(value);
                if (!strcasecmp(key, "ib_rooms")) ib_rooms = atoi(value);
                if (!strcasecmp(key, "ib_users")) ib_users = atoi(value);
@@ -76,129 +82,147 @@ void do_iconbar(void) {
                if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
        }
 
-       output_headers(11);
-       do_template("beginbox_nt");
-
-       wprintf("<center>\n");
-
-       if (ib_logo) if (ib_displayas != IB_TEXTONLY) wprintf(
-               "<IMG BORDER=\"0\" WIDTH=\"48\" "
-                       "HEIGHT=\"48\" SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
-                       "<BR>\n"
+       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_summary) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
-                       "<A HREF=\"/summary\" "
+               wprintf("<li><A HREF=\"/summary\" "
                        "TITLE=\"Your summary page\" "
-                       "TARGET=\"workspace\">"
+                       ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                               "SRC=\"/static/summary.gif\"><BR>");
+                               "SRC=\"/static/summary.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Summary<BR>");
+                       wprintf("Summary");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        if (ib_inbox) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<li>"
                        "<A HREF=\"/dotgoto?room=_MAIL_\" "
                        "TITLE=\"Go to your e-mail inbox\" "
-                       "TARGET=\"workspace\">"
+                       ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                               "SRC=\"/static/mail.gif\"><BR>");
+                               "SRC=\"/static/mail.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Mail<BR>");
+                       wprintf("Mail");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        if (ib_calendar) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<li>"
                        "<A HREF=\"/dotgoto?room=Calendar\" "
                        "TITLE=\"Go to your personal calendar\" "
-                       "TARGET=\"workspace\">"
+                       ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/vcalendar.gif\"><BR>");
+                       "SRC=\"/static/vcalendar.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Calendar<BR>");
+                       wprintf("Calendar");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        if (ib_contacts) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<li>"
                        "<A HREF=\"/dotgoto?room=Contacts\" "
                        "TITLE=\"Go to your personal address book\" "
-                       "TARGET=\"workspace\">"
+                       ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/vcard.gif\"><BR>");
+                       "SRC=\"/static/vcard.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Contacts<BR>");
+                       wprintf("Contacts");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
+       }
+
+       if (ib_notes) {
+               wprintf("<li>"
+                       "<A HREF=\"/dotgoto?room=Notes\" "
+                       "TITLE=\"Go to your personal notes\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/note.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Notes");
+               }
+               wprintf("</A></li>\n");
        }
 
        if (ib_tasks)  {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<li>"
                        "<A HREF=\"/dotgoto?room=Tasks\" "
                        "TITLE=\"Go to your personal task list\" "
-                       "TARGET=\"workspace\">"
+                       ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/vcalendar.gif\"><BR>");
+                       "SRC=\"/static/vcalendar.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Tasks<BR>");
+                       wprintf("Tasks");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        if (ib_rooms) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
-                       "<A HREF=\"/knrooms\" TITLE=\"Shows a list of all "
-                       "Rooms that you have access to\" TARGET=\"workspace\">"
+               wprintf("<li>"
+                       "<A HREF=\"/knrooms\" TITLE=\"List all of your "
+                       "accessible rooms\" >"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/rooms-icon.gif\"><BR>");
+                       "SRC=\"/static/rooms-icon.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Rooms<BR>");
+                       wprintf("Rooms");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        if (ib_users) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<li>"
                        "<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
-                       "TARGET=\"workspace\">"
+                       ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/users-icon.gif\"><BR>");
+                       "SRC=\"/static/users-icon.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Users<BR>");
+                       wprintf("Users");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        if (ib_chat) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<li>"
                        "<A HREF=\"#\" onClick=\"window.open('/chat', "
                        "'ctdl_chat_window', "
                        "'toolbar=no,location=no,directories=no,copyhistory=no,"
@@ -207,68 +231,68 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/chat-icon.gif\"><BR>");
+                       "SRC=\"/static/chat-icon.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Chat<BR>");
+                       wprintf("Chat");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        if (ib_advanced) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<li>"
                        "<A HREF=\"/display_main_menu\" "
                        "TITLE=\"Advanced Options Menu: Advanced Room commands, "
                        "Account Info, and Chat\" "
-                       "TARGET=\"workspace\">"
+                       ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/advanced-icon.gif\"><BR>");
+                       "SRC=\"/static/advanced-icon.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Advanced options<BR>");
+                       wprintf("Advanced");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        if (ib_logoff) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
-                       "<A HREF=\"/termquit\" TITLE=\"Log off\" TARGET=\"_top\" "
+               wprintf("<li>"
+                       "<A HREF=\"/termquit\" TITLE=\"Log off\" "
                        "onClick=\"return confirm('Log off now?');\">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/exit-icon.gif\"><BR>");
+                       "SRC=\"/static/exit-icon.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Log off<BR>");
+                       wprintf("Log off");
                }
-               wprintf("</A></SPAN><BR>\n");
+               wprintf("</A></li>\n");
        }
 
        wprintf(
-               "<SPAN CLASS=\"customize\">"
+               "<li><div align=\"center\">"
                "<A HREF=\"/display_customize_iconbar\" "
                "TITLE=\"Customize this menu\" "
-               "TARGET=\"workspace\">customize this menu</A>"
-               "</SPAN><BR>\n"
+               ">customize this menu</A>"
+               "</A></div></li>\n"
        );
 
        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
-               "<SPAN CLASS=\"powered_by\">"
-               "<A HREF=\"http://uncensored.citadel.org/citadel\" "
-               "TITLE=\"Find out more about Citadel/UX\" TARGET=\"aboutcit\" "
+               "<li><div align=\"center\">"
+               "<A HREF=\"http://www.citadel.org\" "
+               "title=\"Find out more about Citadel\" target=\"aboutcit\" "
                "onMouseOver=\"window.status='Find out more about "
-               "Citadel/UX'; return true;\">powered by<BR><IMG "
+               "Citadel'; return true;\">powered by<br /><IMG "
                "BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadel-logo.jpg\" ALT=\"CITADEL/UX\"></A>"
-               "</SPAN>\n"
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\">"
+               "<br />CITADEL</A>"
+               "</div></li>\n"
        );
 
-       wprintf("</CENTER>\n");
-       do_template("endbox");
-       wDumpContent(2);
+       wprintf("</ul>\n"
+               "</div>\n");
 }
 
 
@@ -285,11 +309,12 @@ void display_customize_iconbar(void) {
         * configuration somewhere.
         */
        int ib_displayas = IB_PICTEXT;  /* pictures and text, pictures, text */
-       int ib_logo = 1;        /* Site logo */
+       int ib_logo = 0;        /* Site logo */
        int ib_summary = 0;     /* Summary page icon */
        int ib_inbox = 0;       /* Inbox icon */
        int ib_calendar = 0;    /* Calendar icon */
        int ib_contacts = 0;    /* Contacts icon */
+       int ib_notes = 0;       /* Notes icon */
        int ib_tasks = 0;       /* Tasks icon */
        int ib_rooms = 1;       /* Rooms icon */
        int ib_users = 1;       /* Users icon */
@@ -312,6 +337,7 @@ void display_customize_iconbar(void) {
                if (!strcasecmp(key, "ib_inbox")) ib_inbox = atoi(value);
                if (!strcasecmp(key, "ib_calendar")) ib_calendar = atoi(value);
                if (!strcasecmp(key, "ib_contacts")) ib_contacts = atoi(value);
+               if (!strcasecmp(key, "ib_notes")) ib_notes = atoi(value);
                if (!strcasecmp(key, "ib_tasks")) ib_tasks = atoi(value);
                if (!strcasecmp(key, "ib_rooms")) ib_rooms = atoi(value);
                if (!strcasecmp(key, "ib_users")) ib_users = atoi(value);
@@ -321,7 +347,7 @@ void display_customize_iconbar(void) {
                if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
        }
 
-       output_headers(3);
+       output_headers(1, 1, 0, 0, 0, 0, 0);
        svprintf("BOXTITLE", WCS_STRING, "Customize the icon bar");
        do_template("beginbox");
 
@@ -338,11 +364,11 @@ void display_customize_iconbar(void) {
                if (i == IB_TEXTONLY) wprintf("text only");
                wprintf("\n");
        }
-       wprintf("<BR><BR>\n");
+       wprintf("<br /><br />\n");
 
        wprintf("Select the icons you would like to see displayed "
                "in the &quot;icon bar&quot; menu on the left side of the "
-               "screen.</CENTER><BR>\n"
+               "screen.</CENTER><br />\n"
        );
 
        wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
@@ -353,7 +379,7 @@ void display_customize_iconbar(void) {
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Site logo</B><BR>"
+               "<B>Site logo</B><br />"
                "A graphic describing this site"
                "</TD></TR>\n",
                (ib_logo ? "CHECKED" : "")
@@ -365,7 +391,7 @@ void display_customize_iconbar(void) {
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/summary.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Summary</B><BR>"
+               "<B>Summary</B><br />"
                "Your summary page"
                "</TD></TR>\n",
                (ib_summary ? "CHECKED" : "")
@@ -377,7 +403,7 @@ void display_customize_iconbar(void) {
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/mail.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Mail (inbox)</B><BR>"
+               "<B>Mail (inbox)</B><br />"
                "A shortcut to your e-mail Inbox."
                "</TD></TR>\n",
                (ib_inbox ? "CHECKED" : "")
@@ -390,118 +416,131 @@ void display_customize_iconbar(void) {
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/vcard.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Contacts</B><BR>"
+               "<B>Contacts</B><br />"
                "Your personal address book."
                "</TD></TR>\n",
                (ib_contacts ? "CHECKED" : "")
        );
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_notes\" "
+               "VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/note.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Notes</B><br />"
+               "Your personal notes."
+               "</TD></TR>\n",
+               (ib_notes ? "CHECKED" : "")
+       );
+
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+       wprintf("<TR><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_calendar\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Calendar</B><BR>"
+               "<B>Calendar</B><br />"
                "A shortcut to your personal calendar."
                "</TD></TR>\n",
                (ib_calendar ? "CHECKED" : "")
        );
 
-       wprintf("<TR><TD>"
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_tasks\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Tasks</B><BR>"
+               "<B>Tasks</B><br />"
                "A shortcut to your personal task list."
                "</TD></TR>\n",
                (ib_tasks ? "CHECKED" : "")
        );
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+       wprintf("<TR><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_rooms\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/rooms-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Rooms</B><BR>"
+               "<B>Rooms</B><br />"
                "Clicking this icon displays a list of all accesible "
                "rooms (or folders) available."
                "</TD></TR>\n",
                (ib_rooms ? "CHECKED" : "")
        );
 
-       wprintf("<TR><TD>"
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_users\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/users-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Users</B><BR>"
+               "<B>Users</B><br />"
                "Clicking this icon displays a list of all users "
                "currently logged in."
                "</TD></TR>\n",
                (ib_users ? "CHECKED" : "")
        );
 
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+       wprintf("<TR><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_chat\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/chat-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Chat</B><BR>"
+               "<B>Chat</B><br />"
                "Clicking this icon enters real-time chat mode "
                "with other users in the same room."
                "</TD></TR>\n",
                (ib_chat ? "CHECKED" : "")
        );
 
-       wprintf("<TR><TD>"
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_advanced\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Advanced options</B><BR>"
+               "<B>Advanced options</B><br />"
                "Access to the complete menu of Citadel functions."
                "</TD></TR>\n",
                (ib_advanced ? "CHECKED" : "")
        );
 
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+       wprintf("<TR><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_logoff\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/exit-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Log off</B><BR>"
+               "<B>Log off</B><br />"
                "Exit from the Citadel system.  If you remove this icon "
                "then you will have no way out!"
                "</TD></TR>\n",
                (ib_logoff ? "CHECKED" : "")
        );
-       wprintf("<TR><TD>"
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_citadel\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadel-logo.jpg\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Citadel logo</B><BR>"
+               "<B>Citadel logo</B><br />"
                "Displays the &quot;Powered by Citadel&quot; graphic"
                "</TD></TR>\n",
                (ib_citadel ? "CHECKED" : "")
        );
 
-       wprintf("</TABLE><BR>\n"
+       wprintf("</TABLE><br />\n"
                "<CENTER>"
                "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
                "&nbsp;"
@@ -524,6 +563,7 @@ void commit_iconbar(void) {
                "ib_inbox",
                "ib_calendar",
                "ib_contacts",
+               "ib_notes",
                "ib_tasks",
                "ib_rooms",
                "ib_users",
@@ -552,11 +592,10 @@ void commit_iconbar(void) {
 
        set_preference("iconbar", iconbar);
 
-       output_headers(3);
+       output_headers(1, 1, 0, 0, 0, 0, 0);
        do_template("beginbox_nt");
        wprintf(
-               "<IMG SRC=\"/static/advanced-icon.gif\" "
-               "onLoad=\"javascript:top['iconbarframe'].location.reload();\">"
+               "<IMG SRC=\"/static/advanced-icon.gif\">"
                "&nbsp;"
                "Your icon bar has been updated.  Please select any of its "
                "choices to continue.\n"