* added matts date picker widget

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 00ecb0fa94a0e5667b3a0b02fbc521accbab9b23..0561d09ba235d71b48fa5dbf88e26b1c6078fedc 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\" target=\"aboutcit\"> "
+                "title=\"%s\"> "
                 "<img "
                 "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
                 "</div>\n",
@@ -114,7 +112,7 @@ void do_iconbar(void) {
                        ">", _("Your summary page")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                                "src=\"static/summscreen_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -131,7 +129,7 @@ void do_iconbar(void) {
                        _("Go to your email inbox")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                                "src=\"static/privatemess_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -156,7 +154,7 @@ void do_iconbar(void) {
                        _("Go to your personal calendar")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/calarea_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -173,7 +171,7 @@ void do_iconbar(void) {
                        _("Go to your personal address book")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/viewcontacts_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -190,7 +188,7 @@ void do_iconbar(void) {
                        _("Go to your personal notes")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/storenotes_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -207,7 +205,7 @@ void do_iconbar(void) {
                        _("Go to your personal task list")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/taskmanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -222,7 +220,7 @@ void do_iconbar(void) {
                        _("List all of your accessible rooms")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/chatrooms_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -238,7 +236,7 @@ void do_iconbar(void) {
                        _("See who is online right now")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/usermanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -262,7 +260,7 @@ void do_iconbar(void) {
                        ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/citadelchat_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -279,7 +277,7 @@ void do_iconbar(void) {
                        _("Advanced Options Menu: Advanced Room commands, Account Info, and Chat")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -296,7 +294,7 @@ void do_iconbar(void) {
                        _("Room and system administration functions")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -313,7 +311,7 @@ void do_iconbar(void) {
                
        );
        if (ib_displayas != IB_TEXTONLY) {
-       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+       wprintf("<img alt=\"\" "
                "src=\"static/logoff_32x.gif\">");
        }
        if (ib_displayas != IB_PICONLY) {
@@ -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\" target=\"aboutcit\"> "
+                "title=\"%s\"> "
                 "<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 border=\"0\" width=\"32\" height=\"32\" "
+       wprintf("<img alt=\"\" "
                "src=\"static/logoff_32x.gif\">");
        }
        if (ib_displayas != IB_PICONLY) {
@@ -485,11 +483,12 @@ void display_customize_iconbar(void) {
        }
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\" class=\"service_banner\">\n");
+       wprintf("<div id=\"banner\">");
        wprintf("<h1>");
        wprintf(_("Customize the icon bar"));
        wprintf("</h1></div>\n");
-       wprintf("<div id=\"content\" class=\"customize_menu\">\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">");
 
@@ -601,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;"
@@ -635,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>"
@@ -767,19 +764,19 @@ void commit_iconbar(void) {
                "ib_citadel"
        };
 
-       if (IsEmptyStr(bstr("ok_button"))) {
+       if (!havebstr("ok_button")) {
                display_main_menu();
                return;
        }
 
-       sprintf(iconbar, "ib_displayas=%d", atoi(bstr("ib_displayas")));
+       sprintf(iconbar, "ib_displayas=%d", ibstr("ib_displayas"));
 
        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 {
@@ -791,11 +788,12 @@ void commit_iconbar(void) {
        set_preference("iconbar", iconbar, 1);
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\" class=\"service_banner\">\n");
+       wprintf("<div id=\"banner\">\n");
        wprintf("<h1>");
        wprintf(_("Customize the icon bar"));
        wprintf("</h1></div>\n");
-       wprintf("<div id=\"content\" class=\"customize_menu\">\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
        wprintf(
                "<center><table border=1 bgcolor=\"#ffffff\"><tr><td>"
                "<img src=\"static/advanpage2_48x.gif\">"