* static.local/ is now created

* static.local/webcit.css (if found) is now referenced

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index a40e3fd3981a9fd929dfe4d74c749e704985e285..187ae3c4267759cd89529fce711f533c6c4642c6 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -85,6 +85,7 @@ $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
 install:
        test -d $(DESTDIR)$(prefix) || mkdir $(DESTDIR)$(prefix)
        test -d $(DESTDIR)$(prefix)/static || mkdir $(DESTDIR)$(prefix)/static
+       test -d $(DESTDIR)$(prefix)/local || mkdir $(DESTDIR)$(prefix)/local
        for i in `find tiny_mce -type d | grep -v .svn` \
                ; do \
                test -d $(DESTDIR)$(prefix)/$$i || mkdir $(DESTDIR)$(prefix)/$$i; \

diff --git a/webcit/README.txt b/webcit/README.txt
index f98af93e74760ebe3b19617f263789b22d31039a..5e1916ac0f148a964da848930f3b7924f3f7bb4c 100644 (file)
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -176,6 +176,21 @@ ones which you may be interested in are:
  If you would like to deploy a "favicon.ico" graphic, please put it in
 the static/ directory.  WebCit will properly serve it from there.
  
+
+ CUSTOMIZATION
+ -------------
+
+ The default WebCit installation will create an empty directory called 
+"static.local".  In this directory you may place a file called "webcit.css"
+which, if present, is referenced *after* the default stylesheet.  If you
+know CSS and wish to customize your WebCit installation, any styles you
+declare in static.local/webcit.css will override the styles found in
+static/webcit.css -- and your customizations will not be overwritten when
+you upgrade WebCit later.
+
+ You may also place other files, such as images, in static.local for
+further customization.
+
  
  CALENDAR SERVICE
  ----------------

diff --git a/webcit/static/head.html b/webcit/static/head.html
index 8ed78102cce7796109ed6ef98e3dc80e2e6aba26..8485041549803b4a8b104a026391f5bf9ede2b7c 100644 (file)
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -5,6 +5,7 @@
 <title><?SERV_HUMANNODE></title>
 <meta name="MSSmartTagsPreventParsing" content="TRUE" />
 <link href="static/webcit.css" rel="stylesheet" type="text/css">
+<?CSSLOCAL>
 <script type="text/javascript" src="static/wclib.js"></script>
 <script type="text/javascript" src="static/prototype.js"></script>
 <script type="text/javascript" src="static/scriptaculous.js"></script>

diff --git a/webcit/webcit.c b/webcit/webcit.c
index d61a66a1463b83b5b8581110d8acb905edfd4dd4..803b877f8f2bd281dcfa8b9861fa0b798939c32a 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -429,6 +429,11 @@ void output_headers(       int do_httpheaders,     /**< 1 = output HTTP headers
 
        if (do_htmlhead) {
                begin_burst();
+               if (!access("static.local/webcit.css", R_OK)) {
+                       svprintf("CSSLOCAL", WCS_STRING,
+                          "<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"
+                       );
+               }
                do_template("head");
        }
 

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 99820909ddd939bd2ef8c8ec5a9ef97a9c2a9039..a263c9c9254a7cae6a1ad34466483382a420d8ec 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -44,6 +44,7 @@ int ndirs=2; //sizeof(static_content_dirs);//sizeof(char *);
  */
 char *static_content_dirs[] = {
        "static",                     /** static templates */
+       "static.local",               /** site local static templates */
        "tiny_mce"                    /** the JS editor */
 };