* Laid the groundwork for a customizable iconbar

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index fa30694b13c2cd21b65a66c45d17360f6ddf3699..af3974b740d4db11f1acef75bfc9b6be4073022f 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 500.11  2003/08/02 05:25:46  ajc
+* Laid the groundwork for a customizable iconbar
+
 Revision 500.10  2003/07/30 03:57:49  ajc
 * Add config.c_purge_hour to config screen
 
@@ -1530,3 +1533,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/Makefile.in b/webcit/Makefile.in
index 58222854864ac6915aba02c7649280430a128b08..90f84e421dd06ae30ef2ddbbdeed61f8d40dc4d8 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -29,14 +29,16 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
        vcard.o vcard_edit.o preferences.o html2html.o listsub.o \
        mime_parser.o graphics.o netconf.o siteconfig.o subst.o \
        calendar.o calendar_tools.o calendar_view.o event.o \
-       availability.o $(LIBOBJS)
+       availability.o iconbar.o \
+       $(LIBOBJS)
        $(CC) webserver.o context_loop.o tools.o cookie_conversion.o \
        webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o listsub.o \
        roomops.o messages.o userlist.o paging.o sysmsgs.o useredit.o \
        locate_host.o siteconfig.o subst.o vcard.o vcard_edit.o floors.o \
        mime_parser.o graphics.o netconf.o preferences.o html2html.o \
        summary.o calendar.o calendar_tools.o calendar_view.o event.o \
-       availability.o ical_dezonify.o $(LIBOBJS) $(LIBS) -o webserver
+       availability.o ical_dezonify.o iconbar.o \
+       $(LIBOBJS) $(LIBS) -o webserver
 
 .c.o:
        $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"`pwd`\" $<

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
new file mode 100644 (file)
index 0000000..3f4558b
--- /dev/null
+++ b/webcit/iconbar.c
@@ -0,0 +1,48 @@
+/* $Id$ */
+
+#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"
+
+
+void do_iconbar(void) {
+       do_template("iconbar");
+}
+
+
+
+void customize_iconbar(void) {
+       char iconbar[SIZ];
+
+       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"
+       );
+
+       wprintf("(FIXME this is not done yet)");
+
+       do_template("endbox");
+       wDumpContent(2);
+}

diff --git a/webcit/static/iconbar.html b/webcit/static/iconbar.html
index db33d074500220434c1e25ecf943710ef5ed4597..58e6e19c929498d4de33cbd7773484d38fd40cc6 100644 (file)
--- a/webcit/static/iconbar.html
+++ b/webcit/static/iconbar.html
@@ -48,6 +48,13 @@ Log off</A>
 </SPAN>
 <BR>
 
+
+<SPAN CLASS="customize">
+<A HREF="/customize_iconbar" TITLE="Customize this menu" TARGET="workspace">
+customize this menu</A>
+</SPAN>
+<BR>
+
 <SPAN CLASS="powered_by">
 <A HREF="http://uncensored.citadel.org/citadel"
        TITLE="Find out more about Citadel/UX" TARGET="aboutcit"

diff --git a/webcit/static/mainframeset.html b/webcit/static/mainframeset.html
index 4f26b44f7edc8b89641f55f4935b263a960e3837..912a8e20e7d847d385bfc04d24ba9563ffc81a78 100644 (file)
--- a/webcit/static/mainframeset.html
+++ b/webcit/static/mainframeset.html
@@ -7,7 +7,7 @@
 </HEAD>
 
 <FRAMESET COLS="80, *" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">
-       <FRAME NAME="left" SRC="do_template?template=iconbar" SCROLLING="no">
+       <FRAME NAME="left" SRC="/iconbar" SCROLLING="no">
        <FRAMESET ROWS="*, 45" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER="0">
                <FRAME NAME="workspace" SRC="<?STARTPAGE>">
                <FRAMESET COLS="*, 1" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">

diff --git a/webcit/static/style.css b/webcit/static/style.css
index 82bfc3b8db4620d398f0c86083f872004231d489..efada346f251d643a54495a0ba47ef8c06a075fe 100644 (file)
--- a/webcit/static/style.css
+++ b/webcit/static/style.css
@@ -83,6 +83,14 @@ a:active {
        color: #000044;
 }
 
+.customize {
+       font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
+       font-size: 6pt;
+       font-style: italic;
+       color: #000044;
+       background-color: #DDDDCC;
+}
+
 .room_banner_room_name {
        font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
        font-size: 14pt;

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 90984f330d96044447f86cba787d24dd48a064bb..58a7b46f6379918fbe71845eae43b82ddc68e21b 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1156,6 +1156,10 @@ void session_loop(struct httprequest *req)
 #endif
        } else if (!strcasecmp(action, "summary")) {
                summary();
+       } else if (!strcasecmp(action, "iconbar")) {
+               do_iconbar();
+       } else if (!strcasecmp(action, "customize_iconbar")) {
+               customize_iconbar();
        } else if (!strcasecmp(action, "diagnostics")) {
                output_headers(1);
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index af858845cb6e429584bce71610614470b6ecb80c..69ffc519104179e7d001c1620b27bf1b05e7c779 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -422,3 +422,5 @@ void sleeeeeeeeeep(int);
 void http_transmit_thing(char *thing, size_t length, char *content_type,
                         int is_static);
 void unescape_input(char *buf);
+void do_iconbar(void);
+void customize_iconbar(void);