Began making changes to do better handling of character sets.
[citadel.git] / webcit / iconbar.c
index 248f2b6806da7937a149f790a7ebc7d617a58f4a..bb9a4e41711258f5f0b71dc456fc38ea21b194c6 100644 (file)
@@ -1,61 +1,62 @@
 /*
  * $Id$
- *
- * Displays and customizes the iconbar.
  */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <time.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
+/**
+ * \defgroup IconBar Displays and customizes the iconbar.
+ * \ingroup MenuInfrastructure
+ */
+/*@{*/
 #include "webcit.h"
 
 
-/* Values for ib_displayas */
-#define IB_PICTEXT     0
-#define IB_PICONLY     1
-#define IB_TEXTONLY    2
+/** Values for ib_displayas */
+#define IB_PICTEXT     0 /**< picture and text */
+#define IB_PICONLY     1 /**< just a picture */
+#define IB_TEXTONLY    2 /**< just text */
 
+
+/**
+ * \brief draw the icon bar?????
+ */
+void do_selected_iconbar(void) {
+       if (WC->current_iconbar == current_iconbar_roomlist) {
+               do_iconbar_roomlist();
+       }
+       else {
+               do_iconbar();
+       }
+}
+
+/**
+ * \brief draw the icon bar???
+ */
 void do_iconbar(void) {
        char iconbar[SIZ];
        char buf[SIZ];
        char key[SIZ], value[SIZ];
        int i;
 
-       /* The initialized values of these variables also happen to
+       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
         * configuration somewhere.
         */
-       int ib_displayas = 0;   /* pictures and text, pictures, text */
-       int ib_logo = 0;        /* Site logo */
-       int ib_summary = 1;     /* Summary page icon */
-       int ib_inbox = 1;       /* Inbox icon */
-       int ib_calendar = 1;    /* Calendar icon */
-       int ib_contacts = 1;    /* Contacts icon */
-       int ib_notes = 1;       /* Notes icon */
-       int ib_tasks = 1;       /* Tasks icon */
-       int ib_rooms = 1;       /* Rooms icon */
-       int ib_users = 1;       /* Users icon */
-       int ib_chat = 1;        /* Chat icon */
-       int ib_advanced = 1;    /* Advanced Options icon */
-       int ib_citadel = 1;     /* 'Powered by Citadel' logo */
+       int ib_displayas = 0;   /**< pictures and text, pictures, text */
+       int ib_logo = 0;        /**< Site logo */
+       int ib_summary = 1;     /**< Summary page icon */
+       int ib_inbox = 1;       /**< Inbox icon */
+       int ib_calendar = 1;    /**< Calendar icon */
+       int ib_contacts = 1;    /**< Contacts icon */
+       int ib_notes = 1;       /**< Notes icon */
+       int ib_tasks = 1;       /**< Tasks icon */
+       int ib_rooms = 1;       /**< Rooms icon */
+       int ib_users = 1;       /**< Users icon */
+       int ib_chat = 1;        /**< Chat icon */
+       int ib_advanced = 1;    /**< Advanced Options icon */
+       int ib_citadel = 1;     /**< 'Powered by Citadel' logo */
        /*
         */
 
@@ -88,7 +89,7 @@ void do_iconbar(void) {
                wprintf("<li>");
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" "
-                               "HEIGHT=\"32\" SRC=\"/image&name=hello\" ALT=\"&nbsp;\">\n"
+                               "HEIGHT=\"32\" src=\"image&name=hello\" ALT=\"&nbsp;\">\n"
                        );
                }
                wprintf("</li>\n");
@@ -96,143 +97,161 @@ void do_iconbar(void) {
 
        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
                "<li><div align=\"center\">"
-               "<A HREF=\"http://www.citadel.org\" "
-               "title=\"Find out more about Citadel\" target=\"aboutcit\">"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\">"
-               "CITADEL</A>"
-               "</div></li>\n"
+               "<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()\">");
+       wprintf(_("switch to room list"));
+       wprintf("</a></div>");
 
        if (ib_summary) {
-               wprintf("<li><A HREF=\"/summary\" "
-                       "TITLE=\"Your summary page\" "
-                       ">"
+               wprintf("<li><a href=\"summary\" "
+                       "TITLE=\"%s\" "
+                       ">", _("Your summary page")
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                               "SRC=\"/static/summary.gif\">");
+                               "src=\"static/summscreen_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Summary");
+                       wprintf(_("Summary"));
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_inbox) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=_MAIL_\" "
-                       "TITLE=\"Go to your e-mail inbox\" "
-                       ">"
+                       "<a href=\"dotgoto?room=_MAIL_\" "
+                       "TITLE=\"%s\" "
+                       ">",
+                       _("Go to your email inbox")
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                               "SRC=\"/static/mail.gif\">");
+                               "src=\"static/privatemess_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Mail");
+                       wprintf(_("Mail"));
+                       if (WC->new_mail != WC->remember_new_mail) {
+/*
+                               if (WC->new_mail > 0) {
+                                       wprintf(" <b>(%d)</b>", WC->new_mail);
+                               }
+*/
+                               WC->remember_new_mail = WC->new_mail;
+                       }
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_calendar) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Calendar\" "
-                       "TITLE=\"Go to your personal calendar\" "
-                       ">"
+                       "<a href=\"dotgoto?room=_CALENDAR_\" "
+                       "TITLE=\"%s\" "
+                       ">",
+                       _("Go to your personal calendar")
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/vcalendar.gif\">");
+                       "src=\"static/calarea_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Calendar");
+                       wprintf(_("Calendar"));
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_contacts) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Contacts\" "
-                       "TITLE=\"Go to your personal address book\" "
-                       ">"
+                       "<a href=\"dotgoto?room=_CONTACTS_\" "
+                       "TITLE=\"%s\" "
+                       ">",
+                       _("Go to your personal address book")
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/vcard.gif\">");
+                       "src=\"static/viewcontacts_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Contacts");
+                       wprintf(_("Contacts"));
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_notes) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Notes\" "
-                       "TITLE=\"Go to your personal notes\" "
-                       ">"
+                       "<a href=\"dotgoto?room=_NOTES_\" "
+                       "TITLE=\"%s\" "
+                       ">",
+                       _("Go to your personal notes")
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/note.gif\">");
+                       "src=\"static/storenotes_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Notes");
+                       wprintf(_("Notes"));
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_tasks)  {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Tasks\" "
-                       "TITLE=\"Go to your personal task list\" "
-                       ">"
+                       "<a href=\"dotgoto?room=_TASKS_\" "
+                       "TITLE=\"%s\" "
+                       ">",
+                       _("Go to your personal task list")
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/tasks.gif\">");
+                       "src=\"static/taskmanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Tasks");
+                       wprintf(_("Tasks"));
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_rooms) {
                wprintf("<li>"
-                       "<A HREF=\"/knrooms\" TITLE=\"List all of your "
-                       "accessible rooms\" >"
+                       "<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/rooms-icon.gif\">");
+                       "src=\"static/chatrooms_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Rooms");
+                       wprintf(_("Rooms"));
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_users) {
                wprintf("<li>"
-                       "<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
-                       ">"
+                       "<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/users-icon.gif\">");
+                       "src=\"static/usermanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Who is online?");
+                       wprintf(_("Who is online?"));
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_chat) {
                wprintf("<li>"
-                       "<A HREF=\"#\" onClick=\"window.open('/chat', "
+                       "<a href=\"#\" onClick=\"window.open('chat', "
                        "'ctdl_chat_window', "
                        "'toolbar=no,location=no,directories=no,copyhistory=no,"
                        "status=no,scrollbars=yes,resizable=yes');\""
@@ -240,76 +259,171 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/chat-icon.gif\">");
+                       "src=\"static/citadelchat_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Chat");
+                       wprintf(_("Chat"));
                }
                wprintf("</A></li>\n");
        }
 
        if (ib_advanced) {
                wprintf("<li>"
-                       "<A HREF=\"/display_main_menu\" "
-                       "TITLE=\"Advanced Options Menu: Advanced Room commands, "
-                       "Account Info, and Chat\" "
-                       ">"
+                       "<a href=\"display_main_menu\" "
+                       "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/advanced-icon.gif\">");
+                       "src=\"static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Advanced");
+                       wprintf(_("Advanced"));
                }
                wprintf("</A></li>\n");
        }
 
        if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
                wprintf("<li>"
-                       "<A HREF=\"/display_aide_menu\" "
-                       "TITLE=\"Room and system administration functions\" "
-                       ">"
+                       "<a href=\"display_aide_menu\" "
+                       "TITLE=\"%s\" "
+                       ">",
+                       _("Room and system administration functions")
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/advanced-icon.gif\">");
+                       "src=\"static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
-                       wprintf("Administration");
+                       wprintf(_("Administration"));
                }
                wprintf("</A></li>\n");
        }
 
-       if (1) {
-               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\">");
-               }
-               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\">"
-               "<A HREF=\"/display_customize_iconbar\" "
-               "TITLE=\"Customize this menu\" "
-               ">customize this menu</A>"
-               "</A></div></li>\n"
+               "<a href=\"display_customize_iconbar\" "
+               "TITLE=\"%s\" "
+               ">%s"
+               "</A></div></li>\n",
+               _("Customize this menu"),
+               _("customize this menu")
        );
 
-       wprintf("</ul>\n"
-               "</div>\n");
+       wprintf("</ul></div>\n");
 }
 
 
+/**
+ * \brief roomtree view of the iconbar
+ * If the user has toggled the icon bar over to a room list, here's where
+ * we generate its innerHTML...
+ */
+void do_iconbar_roomlist(void) {
+       char iconbar[SIZ];
+       char buf[SIZ];
+       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
+        * configuration somewhere.
+        */
+       int ib_displayas = 0;   /* pictures and text, pictures, text */
+       int ib_logo = 0;        /* Site logo */
+       int ib_citadel = 1;     /* 'Powered by Citadel' logo */
+       /*
+        */
+
+       get_preference("iconbar", iconbar, sizeof iconbar);
+       for (i=0; i<num_tokens(iconbar, ','); ++i) {
+               extract_token(buf, iconbar, i, ',', sizeof buf);
+               extract_token(key, buf, 0, '=', sizeof key);
+               extract_token(value, buf, 1, '=', sizeof value);
+
+               if (!strcasecmp(key, "ib_displayas")) ib_displayas = atoi(value);
+               if (!strcasecmp(key, "ib_logo")) ib_logo = atoi(value);
+               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_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>\n");
+}
+
+
+/**
+ * \brief display a customized version of the iconbar
+ */
 void display_customize_iconbar(void) {
        char iconbar[SIZ];
        char buf[SIZ];
@@ -317,24 +431,25 @@ void display_customize_iconbar(void) {
        int i;
        int bar = 0;
 
-       /* The initialized values of these variables also happen to
+       /**
+        * 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
         * configuration somewhere.
         */
-       int ib_displayas = IB_PICTEXT;  /* pictures and text, pictures, text */
-       int ib_logo = 0;        /* Site logo */
-       int ib_summary = 1;     /* Summary page icon */
-       int ib_inbox = 1;       /* Inbox icon */
-       int ib_calendar = 1;    /* Calendar icon */
-       int ib_contacts = 1;    /* Contacts icon */
-       int ib_notes = 1;       /* Notes icon */
-       int ib_tasks = 1;       /* Tasks icon */
-       int ib_rooms = 1;       /* Rooms icon */
-       int ib_users = 1;       /* Users icon */
-       int ib_chat = 1;        /* Chat icon */
-       int ib_advanced = 1;    /* Advanced Options icon */
-       int ib_citadel = 1;     /* 'Powered by Citadel' logo */
+       int ib_displayas = IB_PICTEXT;  /**< pictures and text, pictures, text */
+       int ib_logo = 0;        /**< Site logo */
+       int ib_summary = 1;     /**< Summary page icon */
+       int ib_inbox = 1;       /**< Inbox icon */
+       int ib_calendar = 1;    /**< Calendar icon */
+       int ib_contacts = 1;    /**< Contacts icon */
+       int ib_notes = 1;       /**< Notes icon */
+       int ib_tasks = 1;       /**< Tasks icon */
+       int ib_rooms = 1;       /**< Rooms icon */
+       int ib_users = 1;       /**< Users icon */
+       int ib_chat = 1;        /**< Chat icon */
+       int ib_advanced = 1;    /**< Advanced Options icon */
+       int ib_citadel = 1;     /**< 'Powered by Citadel' logo */
        /*
         */
 
@@ -359,36 +474,39 @@ void display_customize_iconbar(void) {
                if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
        }
 
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       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\">Customize the icon bar</SPAN>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Customize the icon bar"));
+       wprintf("</SPAN>"
                "</TD></TR></TABLE>\n"
                "</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");
+       wprintf("<FORM METHOD=\"POST\" action=\"commit_iconbar\">\n");
 
-       wprintf("<CENTER>"
-               "Display icons as: ");
+       wprintf("<CENTER>");
+       wprintf(_("Display icons as:"));
+       wprintf(" ");
        for (i=0; i<=2; ++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");
-               if (i == IB_PICONLY) wprintf("pictures only");
-               if (i == IB_TEXTONLY) wprintf("text only");
+               if (i == IB_PICTEXT)    wprintf(_("pictures and text"));
+               if (i == IB_PICONLY)    wprintf(_("pictures only"));
+               if (i == IB_TEXTONLY)   wprintf(_("text only"));
                wprintf("\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"
-       );
+       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");
 
@@ -396,39 +514,45 @@ void display_customize_iconbar(void) {
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_logo\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
+               "src=\"image&name=hello\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Site logo</B><br />"
-               "A graphic describing this site"
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_logo ? "CHECKED" : "")
+               (ib_logo ? "CHECKED" : ""),
+               _("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/summary.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/summscreen_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Summary</B><br />"
-               "Your summary page"
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_summary ? "CHECKED" : "")
+               (ib_summary ? "CHECKED" : ""),
+               _("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/mail.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/privatemess_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Mail (inbox)</B><br />"
-               "A shortcut to your e-mail Inbox."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_inbox ? "CHECKED" : "")
+               (ib_inbox ? "CHECKED" : ""),
+               _("Mail (inbox)"),
+               _("A shortcut to your email Inbox")
        );
 
        wprintf("<TR bgcolor=%s><TD>"
@@ -436,13 +560,15 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/vcard.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/viewcontacts_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Contacts</B><br />"
-               "Your personal address book."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_contacts ? "CHECKED" : "")
+               (ib_contacts ? "CHECKED" : ""),
+               _("Contacts"),
+               _("Your personal address book")
        );
 
        wprintf("<TR bgcolor=%s><TD>"
@@ -450,13 +576,15 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/note.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/storenotes_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Notes</B><br />"
-               "Your personal notes."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_notes ? "CHECKED" : "")
+               (ib_notes ? "CHECKED" : ""),
+               _("Notes"),
+               _("Your personal notes")
        );
 
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
@@ -465,26 +593,30 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/calarea_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Calendar</B><br />"
-               "A shortcut to your personal calendar."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_calendar ? "CHECKED" : "")
+               (ib_calendar ? "CHECKED" : ""),
+               _("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/tasks.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/taskmanag_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Tasks</B><br />"
-               "A shortcut to your personal task list."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_tasks ? "CHECKED" : "")
+               (ib_tasks ? "CHECKED" : ""),
+               _("Tasks"),
+               _("A shortcut to your personal task list")
        );
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
@@ -492,42 +624,49 @@ void display_customize_iconbar(void) {
                "<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;\">"
+               "src=\"static/chatrooms_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Rooms</B><br />"
-               "Clicking this icon displays a list of all accesible "
-               "rooms (or folders) available."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_rooms ? "CHECKED" : "")
+               (ib_rooms ? "CHECKED" : ""),
+               _("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/users-icon.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/usermanag_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Who is online?</B><br />"
-               "Clicking this icon displays a list of all users "
-               "currently logged in."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_users ? "CHECKED" : "")
+               (ib_users ? "CHECKED" : ""),
+               _("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/chat-icon.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/citadelchat_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Chat</B><br />"
-               "Clicking this icon enters real-time chat mode "
-               "with other users in the same room."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_chat ? "CHECKED" : "")
+               (ib_chat ? "CHECKED" : ""),
+               _("Chat"),
+               _("Clicking this icon enters real-time chat mode "
+               "with other users in the same room.")
+               
        );
 
        wprintf("<TR bgcolor=%s><TD>"
@@ -535,13 +674,16 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/advanpage2_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Advanced options</B><br />"
-               "Access to the complete menu of Citadel functions."
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_advanced ? "CHECKED" : "")
+               (ib_advanced ? "CHECKED" : ""),
+               _("Advanced options"),
+               _("Access to the complete menu of Citadel functions.")
+
        );
 
        wprintf("<TR bgcolor=%s><TD>"
@@ -549,28 +691,34 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadel-logo.gif\" ALT=\"&nbsp;\">"
+               "src=\"static/citadel-logo.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Citadel logo</B><br />"
-               "Displays the &quot;Powered by Citadel&quot; graphic"
+               "<B>%s</B><br />"
+               "%s"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_citadel ? "CHECKED" : "")
+               (ib_citadel ? "CHECKED" : ""),
+               _("Citadel logo"),
+               _("Displays the 'Powered by Citadel' icon")
        );
 
        wprintf("</TABLE><br />\n"
                "<CENTER>"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+               "<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
                "&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
-               "</CENTER></FORM>\n"
+               "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
+               "</CENTER></FORM>\n",
+               _("Save changes"),
+               _("Cancel")
        );
 
        wprintf("</td></tr></table></div>\n");
        wDumpContent(2);
 }
 
-
+/**
+ * \brief commit the changes of an edited iconbar ????
+ */
 void commit_iconbar(void) {
        char iconbar[SIZ];
        int i;
@@ -591,7 +739,7 @@ void commit_iconbar(void) {
                "ib_citadel"
        };
 
-       if (strcmp(bstr("sc"), "OK")) {
+       if (strlen(bstr("ok_button")) == 0) {
                display_main_menu();
                return;
        }
@@ -608,16 +756,19 @@ void commit_iconbar(void) {
                }
        }
 
-       set_preference("iconbar", iconbar);
+       set_preference("iconbar", iconbar, 1);
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
+       output_headers(1, 1, 0, 0, 0, 0);
        wprintf(
                "<center><table border=1 bgcolor=\"#ffffff\"><tr><td>"
-               "<IMG SRC=\"/static/advanced-icon.gif\">"
-               "&nbsp;"
-               "Your icon bar has been updated.  Please select any of its "
-               "choices to continue."
-               "</td></tr></table>\n"
-       );
+               "<img src=\"static/advanpage2_48x.gif\">"
+               "&nbsp;");
+       wprintf(_("Your icon bar has been updated.  Please select any of its "
+               "choices to continue."));
+       wprintf("</td></tr></table>\n");
        wDumpContent(2);
 }
+
+
+
+/*@}*/