* moved url argument list to hash.

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index d56d22240b8241f43c1232b02f238f2fc4ef3f8f..eceb4c86426ad13166ef87a09d9fab9423564bf8 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -1,11 +1,9 @@
 /*
  * $Id$
+ *
+ * Displays and customizes the iconbar.
  */
-/**
- * \defgroup IconBar Displays and customizes the iconbar.
- * \ingroup MenuInfrastructure
- */
-/*@{*/
+
 #include "webcit.h"
 
 
@@ -94,7 +92,7 @@ void do_iconbar(void) {
         if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
                 "<div class=\"logo_citadel\"> "
                 "<a href=\"http://www.citadel.org\" "
-                "title=\"%s\"> "
+                "title=\"%s\" target=\"aboutcit\"> "
                 "<img "
                 "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
                 "</div>\n",
@@ -114,8 +112,8 @@ void do_iconbar(void) {
                        ">", _("Your summary page")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img width=\"32\" height=\"32\" "
-                               "src=\"static/summscreen_32x.gif\" alt=\"%s\">", _("Summary"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                               "src=\"static/summscreen_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Summary"));
@@ -131,8 +129,8 @@ void do_iconbar(void) {
                        _("Go to your email inbox")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                               "src=\"static/privatemess_32x.gif\" alt=\"%s\">", _("Mail"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                               "src=\"static/privatemess_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Mail"));
@@ -156,8 +154,8 @@ void do_iconbar(void) {
                        _("Go to your personal calendar")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/calarea_32x.gif\" alt=\"%s\">", _("Calendar"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/calarea_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Calendar"));
@@ -173,8 +171,8 @@ void do_iconbar(void) {
                        _("Go to your personal address book")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/viewcontacts_32x.gif\" alt=\"%s\">", _("Contacts"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/viewcontacts_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Contacts"));
@@ -190,8 +188,8 @@ void do_iconbar(void) {
                        _("Go to your personal notes")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/storenotes_32x.gif\" alt=\"%s\">", _("Notes"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/storenotes_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Notes"));
@@ -207,8 +205,8 @@ void do_iconbar(void) {
                        _("Go to your personal task list")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/taskmanag_32x.gif\" alt=\"%s\">", _("Tasks"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/taskmanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Tasks"));
@@ -222,8 +220,8 @@ void do_iconbar(void) {
                        _("List all of your accessible rooms")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/chatrooms_32x.gif\" alt=\"%s\">", _("Rooms"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/chatrooms_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Rooms"));
@@ -238,8 +236,8 @@ void do_iconbar(void) {
                        _("See who is online right now")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/usermanag_32x.gif\" alt=\"%s\">", _("Who is online?"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/usermanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Who is online?"));
@@ -262,8 +260,8 @@ void do_iconbar(void) {
                        ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/citadelchat_32x.gif\" alt=\"%s\">", _("Chat"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/citadelchat_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Chat"));
@@ -279,8 +277,8 @@ void do_iconbar(void) {
                        _("Advanced Options Menu: Advanced Room commands, Account Info, and Chat")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/advanpage2_32x.gif\" alt=\"%s\">", _("Advanced"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Advanced"));
@@ -296,8 +294,8 @@ void do_iconbar(void) {
                        _("Room and system administration functions")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img  width=\"32\" height=\"32\" "
-                       "src=\"static/advanpage2_32x.gif\" alt=\"%s\">", _("Administration"));
+                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       "src=\"static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf(_("Administration"));
@@ -313,8 +311,8 @@ void do_iconbar(void) {
                
        );
        if (ib_displayas != IB_TEXTONLY) {
-       wprintf("<img  width=\"32\" height=\"32\" "
-               "src=\"static/logoff_32x.gif\" alt=\"%s\">", _("Log off"));
+       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+               "src=\"static/logoff_32x.gif\">");
        }
        if (ib_displayas != IB_PICONLY) {
                wprintf(_("Log off"));
@@ -392,7 +390,7 @@ void do_iconbar_roomlist(void) {
         if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
                 "<div class=\"logo_citadel\"> "
                 "<a href=\"http://www.citadel.org\" "
-                "title=\"%s\"> "
+                "title=\"%s\" target=\"aboutcit\"> "
                 "<img "
                 "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
                 "</div>\n",
@@ -414,7 +412,7 @@ void do_iconbar_roomlist(void) {
                
        );
        if (ib_displayas != IB_TEXTONLY) {
-       wprintf("<img  width=\"32\" height=\"32\" "
+       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
                "src=\"static/logoff_32x.gif\">");
        }
        if (ib_displayas != IB_PICONLY) {
@@ -602,7 +600,6 @@ void display_customize_iconbar(void) {
                _("Your personal notes")
        );
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        bar = 1 - bar;
        wprintf("<tr class=\"%s\"><td>"
                "<input type=\"radio\" name=\"ib_calendar\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
@@ -636,7 +633,6 @@ void display_customize_iconbar(void) {
                _("Tasks"),
                _("A shortcut to your personal task list")
        );
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
        bar = 1 - bar;
        wprintf("<tr class=\"%s\"><td>"
@@ -718,7 +714,7 @@ void display_customize_iconbar(void) {
                "<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\" "
+               "<img border=\"0\" width=\"48\" height=\"48\" "
                "src=\"static/citadel-logo.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
@@ -777,10 +773,10 @@ void commit_iconbar(void) {
 
        for (i=0; i<(sizeof(boxen)/sizeof(char *)); ++i) {
                char *Val;
-               if (!strcasecmp(bstr(boxen[i]), "yes")) {
+               if (!strcasecmp(BSTR(boxen[i]), "yes")) {
                        Val = "1";
                }
-               else if (!strcasecmp(bstr(boxen[i]), "yeslist")) {
+               else if (!strcasecmp(BSTR(boxen[i]), "yeslist")) {
                        Val = "2";
                }
                else {