* New "notes" icon

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index c3adb4ed23b80f05f73e2e78a15b50b1576fd5f2..9a93203987c7d5c38a505d5ed9e3676b99c7f831 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -40,11 +40,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 +68,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);
@@ -91,7 +93,7 @@ void do_iconbar(void) {
                wprintf("<SPAN CLASS=\"iconbar_link\">"
                        "<A HREF=\"/summary\" "
                        "TITLE=\"Your summary page\" "
-                       "TARGET=\"workspace\">"
+                       "TARGET=\"workspace\"><P>"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
@@ -100,11 +102,11 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Summary<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_inbox) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"/dotgoto?room=_MAIL_\" "
                        "TITLE=\"Go to your e-mail inbox\" "
                        "TARGET=\"workspace\">"
@@ -116,11 +118,11 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Mail<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_calendar) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"/dotgoto?room=Calendar\" "
                        "TITLE=\"Go to your personal calendar\" "
                        "TARGET=\"workspace\">"
@@ -132,11 +134,11 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Calendar<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_contacts) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"/dotgoto?room=Contacts\" "
                        "TITLE=\"Go to your personal address book\" "
                        "TARGET=\"workspace\">"
@@ -148,11 +150,27 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Contacts<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
+       }
+
+       if (ib_notes) {
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
+                       "<A HREF=\"/dotgoto?room=Notes\" "
+                       "TITLE=\"Go to your personal notes\" "
+                       "TARGET=\"workspace\">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/note.gif\"><BR>");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Notes<BR>");
+               }
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_tasks)  {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"/dotgoto?room=Tasks\" "
                        "TITLE=\"Go to your personal task list\" "
                        "TARGET=\"workspace\">"
@@ -164,11 +182,11 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Tasks<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_rooms) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"/knrooms\" TITLE=\"Shows a list of all "
                        "Rooms that you have access to\" TARGET=\"workspace\">"
                );
@@ -179,11 +197,11 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Rooms<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_users) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
                        "TARGET=\"workspace\">"
                );
@@ -194,15 +212,15 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Users<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_chat) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"#\" onClick=\"window.open('/chat', "
                        "'ctdl_chat_window', "
                        "'toolbar=no,location=no,directories=no,copyhistory=no,"
-                       "status=yes,scrollbars=yes,resizable=yes');\""
+                       "status=no,scrollbars=yes,resizable=yes');\""
                        ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
@@ -212,11 +230,11 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Chat<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_advanced) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"/display_main_menu\" "
                        "TITLE=\"Advanced Options Menu: Advanced Room commands, "
                        "Account Info, and Chat\" "
@@ -229,11 +247,11 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Advanced options<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        if (ib_logoff) {
-               wprintf("<SPAN CLASS=\"iconbar_link\">"
+               wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
                        "<A HREF=\"/termquit\" TITLE=\"Log off\" TARGET=\"_top\" "
                        "onClick=\"return confirm('Log off now?');\">"
                );
@@ -244,26 +262,27 @@ void do_iconbar(void) {
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Log off<BR>");
                }
-               wprintf("</A></SPAN>\n");
+               wprintf("</A></P></SPAN>\n");
        }
 
        wprintf(
-               "<SPAN CLASS=\"customize\">"
+               "<SPAN CLASS=\"customize\"><P>"
                "<A HREF=\"/display_customize_iconbar\" "
                "TITLE=\"Customize this menu\" "
                "TARGET=\"workspace\">customize this menu</A>"
-               "</SPAN><BR>\n"
+               "</P></SPAN>\n"
        );
 
        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
-               "<SPAN CLASS=\"powered_by\">"
+               "<SPAN CLASS=\"powered_by\"><P>"
                "<A HREF=\"http://uncensored.citadel.org/citadel\" "
-               "TITLE=\"Find out more about Citadel/UX\" TARGET=\"aboutcit\" "
+               "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>"
+               "</P></SPAN>\n"
        );
 
        wprintf("</CENTER>\n");
@@ -285,11 +304,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 +332,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);
@@ -396,8 +417,21 @@ void display_customize_iconbar(void) {
                (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>"
@@ -410,7 +444,7 @@ void display_customize_iconbar(void) {
                (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\" "
@@ -423,7 +457,7 @@ void display_customize_iconbar(void) {
        );
 #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\" "
@@ -436,7 +470,7 @@ void display_customize_iconbar(void) {
                (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\" "
@@ -449,7 +483,7 @@ void display_customize_iconbar(void) {
                (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\" "
@@ -462,7 +496,7 @@ void display_customize_iconbar(void) {
                (ib_chat ? "CHECKED" : "")
        );
 
-       wprintf("<TR><TD>"
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_advanced\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
@@ -475,7 +509,7 @@ void display_customize_iconbar(void) {
                (ib_advanced ? "CHECKED" : "")
        );
 
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+       wprintf("<TR><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_logoff\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
@@ -488,12 +522,12 @@ void display_customize_iconbar(void) {
                "</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>"
                "Displays the &quot;Powered by Citadel&quot; graphic"
@@ -524,6 +558,7 @@ void commit_iconbar(void) {
                "ib_inbox",
                "ib_calendar",
                "ib_contacts",
+               "ib_notes",
                "ib_tasks",
                "ib_rooms",
                "ib_users",