* All OS-level includes are now included from webcit.h instead of from

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 3e77abf0435352ad2d24517245f65f0a8a1473f8..45a3d214fe318ff97b36d19c917aec3e1ea3a074 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -4,26 +4,6 @@
  * 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>
 #include "webcit.h"
 
 
@@ -98,9 +78,8 @@ void do_iconbar(void) {
                "<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>"
+               "<img border=\"0\" "
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\"></a>"
                "</div></li>\n"
        );
 
@@ -138,7 +117,7 @@ void do_iconbar(void) {
 
        if (ib_calendar) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Calendar\" "
+                       "<A HREF=\"/dotgoto?room=_CALENDAR_\" "
                        "TITLE=\"Go to your personal calendar\" "
                        ">"
                );
@@ -154,13 +133,13 @@ void do_iconbar(void) {
 
        if (ib_contacts) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Contacts\" "
+                       "<A HREF=\"/dotgoto?room=_CONTACTS_\" "
                        "TITLE=\"Go to your personal address book\" "
                        ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/savecontact_32x.gif\">");
+                       "SRC=\"/static/viewcontacts_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Contacts");
@@ -170,7 +149,7 @@ void do_iconbar(void) {
 
        if (ib_notes) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Notes\" "
+                       "<A HREF=\"/dotgoto?room=_NOTES_\" "
                        "TITLE=\"Go to your personal notes\" "
                        ">"
                );
@@ -186,7 +165,7 @@ void do_iconbar(void) {
 
        if (ib_tasks)  {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Tasks\" "
+                       "<A HREF=\"/dotgoto?room=_TASKS_\" "
                        "TITLE=\"Go to your personal task list\" "
                        ">"
                );
@@ -217,7 +196,7 @@ void do_iconbar(void) {
 
        if (ib_users) {
                wprintf("<li>"
-                       "<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
+                       "<A HREF=\"/who\" TITLE=\"See who is online right now\" "
                        ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
@@ -300,7 +279,7 @@ void do_iconbar(void) {
                "<li><div align=\"center\">"
                "<A HREF=\"/display_customize_iconbar\" "
                "TITLE=\"Customize this menu\" "
-               ">customize this menu</A>"
+               ">customize this menu"
                "</A></div></li>\n"
        );
 
@@ -436,7 +415,7 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/savecontact_48x.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/viewcontacts_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Contacts</B><br />"
                "Your personal address book."
@@ -478,7 +457,7 @@ void display_customize_iconbar(void) {
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_tasks\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/taskmanag/48x.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/taskmanag_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Tasks</B><br />"
                "A shortcut to your personal task list."
@@ -608,7 +587,7 @@ void commit_iconbar(void) {
                }
        }
 
-       set_preference("iconbar", iconbar);
+       set_preference("iconbar", iconbar, 1);
 
        output_headers(1, 1, 0, 0, 0, 0, 0);
        wprintf(