* moved url argument list to hash.

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 6c43ac706cdbcbff7d559f2857eee3d1d80e0c62..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"
 
 
@@ -485,11 +483,12 @@ void display_customize_iconbar(void) {
        }
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\" class=\"service\">\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>"
@@ -776,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 {
@@ -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\">\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\">"