* First cut at the customizable iconbar is done. A bunch of generic options

  are there.  Still need to get the actual iconbar to refresh when changes
  are made.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index eea68a27342a294a5c4fd0c33216380aa5ba43c6..ec759b1aa33797af2737be065c68a3754ed00080 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 500.13  2003/08/04 03:50:29  ajc
+* First cut at the customizable iconbar is done.  A bunch of generic options
+  are there.  Still need to get the actual iconbar to refresh when changes
+  are made.
+
 Revision 500.12  2003/08/03 21:02:01  ajc
 * More work on customizable iconbar
 
@@ -1536,3 +1541,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 12727346b061142e3d828a43fd5246f57d825423..a0649dc151e35a76d0d751a1ccd162e0bf4b42b3 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -24,7 +24,147 @@
 
 
 void do_iconbar(void) {
-       do_template("iconbar");
+       char iconbar[SIZ];
+       char buf[SIZ];
+       char key[SIZ], value[SIZ];
+       int i;
+
+       /* The initialized values of these variables also happen to
+        * specify the default values for users who haven't customized
+        * their iconbars.  These should probably be set in a master
+        * configuration somewhere.
+        */
+       int ib_logo = 1;        /* Site logo */
+       int ib_inbox = 0;       /* Inbox icon */
+       int ib_calendar = 0;    /* Calendar icon */
+       int ib_tasks = 0;       /* Tasks icon */
+       int ib_rooms = 1;       /* Rooms icon */
+       int ib_users = 1;       /* Users icon */
+       int ib_advanced = 1;    /* Advanced Options icon */
+       int ib_logoff = 1;      /* Logoff button */
+       int ib_citadel = 1;     /* 'Powered by Citadel' logo */
+       /*
+        */
+
+       get_preference("iconbar", iconbar);
+       for (i=0; i<num_tokens(iconbar, ','); ++i) {
+               extract_token(buf, iconbar, i, ',');
+               extract_token(key, buf, 0, '=');
+               extract_token(value, buf, 1, '=');
+
+               if (!strcasecmp(key, "ib_logo")) ib_logo = atoi(value);
+               if (!strcasecmp(key, "ib_inbox")) ib_inbox = atoi(value);
+               if (!strcasecmp(key, "ib_calendar")) ib_calendar = 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);
+               if (!strcasecmp(key, "ib_advanced")) ib_advanced = atoi(value);
+               if (!strcasecmp(key, "ib_logoff")) ib_logoff = atoi(value);
+               if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
+
+       }
+
+
+       output_headers(11);
+       do_template("beginbox_nt");
+
+       wprintf("<center>\n");
+
+       if (ib_logo) wprintf("\"<IMG BORDER=\"0\" WIDTH=\"48\" "
+               "HEIGHT=\"48\" SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
+               "<BR>\n"
+       );
+
+       if (ib_inbox) wprintf(
+               "<SPAN CLASS=\"iconbar_link\">"
+               "<A HREF=\"/dotgoto?room=_MAIL_\" "
+               "TITLE=\"Go to your e-mail inbox\" "
+               "TARGET=\"workspace\">"
+               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "SRC=\"/static/mail.gif\">"
+               "<BR>Mail</A></SPAN><BR>\n"
+       );
+
+       if (ib_calendar) wprintf(
+               "<SPAN CLASS=\"iconbar_link\">"
+               "<A HREF=\"/dotgoto?room=Calendar\" "
+               "TITLE=\"Go to your personal calendar\" "
+               "TARGET=\"workspace\">"
+               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "SRC=\"/static/vcalendar.gif\">"
+               "<BR>Calendar</A></SPAN><BR>\n"
+       );
+
+       if (ib_tasks) wprintf(
+               "<SPAN CLASS=\"iconbar_link\">"
+               "<A HREF=\"/dotgoto?room=Tasks\" "
+               "TITLE=\"Go to your personal task list\" "
+               "TARGET=\"workspace\">"
+               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "SRC=\"/static/vcalendar.gif\">"
+               "<BR>Tasks</A></SPAN><BR>\n"
+       );
+
+       if (ib_rooms) wprintf(
+               "<SPAN CLASS=\"iconbar_link\">"
+               "<A HREF=\"/knrooms\" TITLE=\"Shows a list of all "
+               "Rooms that you have access to\" TARGET=\"workspace\">"
+               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "SRC=\"/static/rooms-icon.gif\">"
+               "<BR>Rooms</A></SPAN><BR>\n"
+       );
+
+       if (ib_users) wprintf(
+               "<SPAN CLASS=\"iconbar_link\">"
+               "<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
+               "TARGET=\"workspace\">"
+               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "SRC=\"/static/users-icon.gif\">"
+               "<BR>Users</A></SPAN><BR>\n"
+       );
+
+       if (ib_advanced) wprintf(
+               "<SPAN CLASS=\"iconbar_link\">"
+               "<A HREF=\"/display_main_menu\" "
+               "TITLE=\"Advanced Options Menu: Advanced Room commands, "
+               "Account Info, and Chat\" "
+               "TARGET=\"workspace\">"
+               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "SRC=\"/static/advanced-icon.gif\">"
+               "<BR>Advanced options</A></SPAN><BR>\n"
+       );
+
+       if (ib_logoff) wprintf(
+               "<SPAN CLASS=\"iconbar_link\">"
+               "<A HREF=\"/termquit\" TITLE=\"Log off\" TARGET=\"_top\" "
+               "onClick=\"return confirm('Log off now?');\">"
+               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+               "SRC=\"/static/exit-icon.gif\">"
+               "<BR>Log off</A></SPAN><BR>\n"
+       );
+
+       wprintf(
+               "<SPAN CLASS=\"customize\">"
+               "<A HREF=\"/display_customize_iconbar\" "
+               "TITLE=\"Customize this menu\" "
+               "TARGET=\"workspace\">customize this menu</A>"
+               "</SPAN><BR>\n"
+       );
+
+       if (ib_citadel) wprintf(
+               "<SPAN CLASS=\"powered_by\">"
+               "<A HREF=\"http://uncensored.citadel.org/citadel\" "
+               "TITLE=\"Find out more about Citadel/UX\" TARGET=\"aboutcit\" "
+               "onMouseOver=\"window.status='Find out more about "
+               "Citadel/UX'; return true;\">powered by<BR><IMG "
+               "BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/citadel-logo.jpg\" ALT=\"CITADEL/UX\"></A>"
+               "</SPAN>\n"
+       );
+
+       wprintf("</CENTER>\n");
+       do_template("endbox");
+       wDumpContent(2);
 }
 
 
@@ -41,6 +181,9 @@ void display_customize_iconbar(void) {
         * configuration somewhere.
         */
        int ib_logo = 1;        /* Site logo */
+       int ib_inbox = 0;       /* Inbox icon */
+       int ib_calendar = 0;    /* Calendar icon */
+       int ib_tasks = 0;       /* Tasks icon */
        int ib_rooms = 1;       /* Rooms icon */
        int ib_users = 1;       /* Users icon */
        int ib_advanced = 1;    /* Advanced Options icon */
@@ -49,22 +192,16 @@ void display_customize_iconbar(void) {
        /*
         */
 
-       output_headers(3);
-       svprintf("BOXTITLE", WCS_STRING, "Customize the icon bar");
-       do_template("beginbox");
-
-       wprintf("<CENTER>Select the icons you would like to see displayed "
-               "in the &quot;icon bar&quot; menu on the left side of the "
-               "screen.</CENTER><HR>\n"
-       );
-
        get_preference("iconbar", iconbar);
-       for (i=0; i<num_tokens(iconbar, '|'); ++i) {
-               extract_token(buf, iconbar, i, '|');
+       for (i=0; i<num_tokens(iconbar, ','); ++i) {
+               extract_token(buf, iconbar, i, ',');
                extract_token(key, buf, 0, '=');
                extract_token(value, buf, 1, '=');
 
                if (!strcasecmp(key, "ib_logo")) ib_logo = atoi(value);
+               if (!strcasecmp(key, "ib_inbox")) ib_inbox = atoi(value);
+               if (!strcasecmp(key, "ib_calendar")) ib_calendar = 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);
                if (!strcasecmp(key, "ib_advanced")) ib_advanced = atoi(value);
@@ -73,8 +210,186 @@ void display_customize_iconbar(void) {
 
        }
 
-       wprintf("(FIXME this is not done yet)");
+       output_headers(3);
+       svprintf("BOXTITLE", WCS_STRING, "Customize the icon bar");
+       do_template("beginbox");
+
+       wprintf("<CENTER>Select the icons you would like to see displayed "
+               "in the &quot;icon bar&quot; menu on the left side of the "
+               "screen.</CENTER><BR>\n"
+       );
+
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/commit_iconbar\">\n");
+       wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_logo\" VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Site logo</B><BR>"
+               "A graphic describing this site"
+               "</TD></TR>\n",
+               (ib_logo ? "CHECKED" : "")
+       );
+
+       wprintf("<TR><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_inbox\" VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/mail.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Mail (inbox)</B><BR>"
+               "A shortcut to your e-mail Inbox."
+               "</TD></TR>\n",
+               (ib_inbox ? "CHECKED" : "")
+       );
+
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_calendar\" "
+               "VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Calendar</B><BR>"
+               "A shortcut to your personal calendar."
+               "</TD></TR>\n",
+               (ib_calendar ? "CHECKED" : "")
+       );
+
+       wprintf("<TR><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_tasks\" VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Tasks</B><BR>"
+               "A shortcut to your personal task list."
+               "</TD></TR>\n",
+               (ib_tasks ? "CHECKED" : "")
+       );
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
+
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_rooms\" VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/rooms-icon.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Rooms</B><BR>"
+               "Clicking this icon displays a list of all accesible "
+               "rooms (or folders) available."
+               "</TD></TR>\n",
+               (ib_rooms ? "CHECKED" : "")
+       );
+
+       wprintf("<TR><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_users\" VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/users-icon.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Users</B><BR>"
+               "Clicking this icon displays a list of all users "
+               "currently logged in."
+               "</TD></TR>\n",
+               (ib_users ? "CHECKED" : "")
+       );
+
+       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_advanced\" "
+               "VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Advanced options</B><BR>"
+               "Access to the complete menu of Citadel functions."
+               "</TD></TR>\n",
+               (ib_advanced ? "CHECKED" : "")
+       );
+
+       wprintf("<TR><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_logoff\" "
+               "VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/exit-icon.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Log off</B><BR>"
+               "Exit from the Citadel system.  If you remove this icon "
+               "then you will have no way out!"
+               "</TD></TR>\n",
+               (ib_logoff ? "CHECKED" : "")
+       );
+       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;\">"
+               "</TD><TD>"
+               "<B>Citadel logo</B><BR>"
+               "Displays the &quot;Powered by Citadel&quot; graphic"
+               "</TD></TR>\n",
+               (ib_citadel ? "CHECKED" : "")
+       );
+
+       wprintf("</TABLE><BR>\n"
+               "<CENTER>"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+               "&nbsp;"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
+               "</CENTER></FORM>\n"
+       );
 
        do_template("endbox");
        wDumpContent(2);
 }
+
+
+void commit_iconbar(void) {
+       char iconbar[SIZ];
+       int i;
+
+       char *boxen[] = {
+               "ib_logo",
+               "ib_inbox",
+               "ib_calendar",
+               "ib_tasks",
+               "ib_rooms",
+               "ib_users",
+               "ib_advanced",
+               "ib_logoff",
+               "ib_citadel"
+       };
+
+       if (strcmp(bstr("sc"), "OK")) {
+               display_main_menu();
+               return;
+       }
+
+       strcpy(iconbar, "");
+
+       for (i=0; i<(sizeof(boxen)/sizeof(char *)); ++i) {
+               if (i > 0) {
+                       sprintf(&iconbar[strlen(iconbar)], ",");
+               }
+               sprintf(&iconbar[strlen(iconbar)], "%s=", boxen[i]);
+               if (!strcasecmp(bstr(boxen[i]), "yes")) {
+                       sprintf(&iconbar[strlen(iconbar)], "1");
+               }
+               else {
+                       sprintf(&iconbar[strlen(iconbar)], "0");
+               }
+       }
+
+       set_preference("iconbar", iconbar);
+
+       output_headers(3);
+       wprintf("FIXME");
+       wDumpContent(2);
+}

diff --git a/webcit/static/style.css b/webcit/static/style.css
index efada346f251d643a54495a0ba47ef8c06a075fe..aad6a8de3f023651e94b9db41357c3031b07fc8f 100644 (file)
--- a/webcit/static/style.css
+++ b/webcit/static/style.css
@@ -154,29 +154,19 @@ body {
 }
 
 h1 {
-  color: #c33;
-  background: none;
   font-weight: bold;
   text-align: center
 }
 
 h2 {
-  color: #00008b;
-  background: none;
   font-weight: bold
 }
 
 h3 {
-  color: #006400;
-  background: none;
-  margin-left: 4%;
-  margin-right: 4%;
   font-weight: bold
 }
 
 h4 {
-  margin-left: 6%;
-  margin-right: 6%;
   font-weight: bold
 }
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 46ba43969fb9837b72f55fb06837d57d25baf06a..4729b005c4440f38a395ceb96d683f72e676bea6 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1160,6 +1160,8 @@ void session_loop(struct httprequest *req)
                do_iconbar();
        } else if (!strcasecmp(action, "display_customize_iconbar")) {
                display_customize_iconbar();
+       } else if (!strcasecmp(action, "commit_iconbar")) {
+               commit_iconbar();
        } else if (!strcasecmp(action, "diagnostics")) {
                output_headers(1);
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index aaed9ad30342b8193af60079f46e117bd7e992cc..cd8fe7f0f16090f026b75572536ecda8a22a086a 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -424,3 +424,4 @@ void http_transmit_thing(char *thing, size_t length, char *content_type,
 void unescape_input(char *buf);
 void do_iconbar(void);
 void display_customize_iconbar(void);
+void commit_iconbar(void);