Updated the README with credits for the new

bubble tooltip, and cleaned up the spelling and grammar in the new sections.

diff --git a/webcit/README b/webcit/README
index 55b2d4a0a62d9e9861c69544aac4747d5b39a760..335ef92431bf7fb149cc010bb8e6fd39379ba58b 100644 (file)
--- a/webcit/README
+++ b/webcit/README
@@ -1,9 +1,10 @@
                         WEBCIT for the Citadel System
-                               version 6.71
+                               version 6.73
  
    Copyright (C) 1996-2006 by the authors.  Portions written by:
        Art Cancro
        Nathan Bryant
+       Alessandro Fulciniti
        Wilifried Goesgens
        Nick Grossman
        Andru Luvisi
@@ -173,12 +174,10 @@ you must have libical v0.24 (or newer) on your system.  You must also be
 running a Citadel server with calendaring support.  The calendar service will
 be automatically configured and installed if your host system supports it.
  
- WebCit also provides Kolab-compatible free/busy data for calendar clients.
-Unlike the Kolab server, however, there is no need for each user to "publish"
+ WebCit also provides iCalendar format free/busy data for calendar clients.
+Unlike with some other servers, there is no need for each user to "publish"
 free/busy data -- it is generated on-the-fly from the server-side calendar
-of the user being queried.  Note: in order to support Kolab clients, you must
-have WebCit running in HTTPS mode on port 443, because that is what Kolab
-clients will be expecting.
+of the user being queried.
   
  
  HTTPS (encryption) SUPPORT
@@ -206,32 +205,35 @@ authority.
  INTEGRATING INTO APACHE
  -----------------------
 
- If you want to include webcit into an Apache, because of you want to have it
-running alongside your i.e. php applications without adding another ip or using a 
-different port than 443 / 80 (which may be blocked by company firewalls for 
-example) you can do this with apaches mod_proxy. One can do this either to make
-webcit fill up into a full vhost (like webcit.mydomain.com) or to go into a 
-subdirectory (like www.mydomain.com/webcit). find two config snippets, that can
-be added to apaches sample ssl config (which you may find in 
-/usr/share/doc/apache2/examples/ssl.conf for example) Warning: you should be somewhat
-experienced with configuring apache to do that!
+ It is best to run WebCit natively on its own HTTP port.  If, however, you wish
+to have WebCit run as part of an Apache web server installation (for example,
+you only have one IP address and you need to stay on port 80 or 443 in order to
+maintain compatibility with corporate firewall policy), you can do this with
+the "mod_proxy" Apache module.
+ 
+ The preferred way to do this is to configure a NameVirtualHost for your WebCit
+installation (for example, http://webcit.example.com) and then proxy that
+virtual host through to WebCit.  The alternative way, which does work but is not
+quite as robust, is to "mount" the WebCit paths as directory aliases to your
+main document root.
+
+Here is how to configure the NameVirtualHost method:
 
-VHOST context:
 <VirtualHost mydomain.com:443>
        #here some of your config stuff like logging, serveradmin...
        NameVirtualHost www.mydomain.com
     <location />
          allow from all
     </location>
-
     ProxyPass / http://127.0.0.1:2000/
     ProxyPassReverse / http://127.0.0.1:2000/
-# make apache give away static content like images...
+# The following line is optional.  It allows WebCit's static content
+# such as images to be served directly by Apache.
     alias /static /var/lib/citadel/www/static
-
 </VirtualHost>
 
-SUBDIR context:
+Here is how to configure the "subdirectory" method:
+
 <VirtualHost mydomain.com:443>
        #here some of your config stuff like logging, serveradmin...
        NameVirtualHost www.mydomain.com
@@ -256,31 +258,37 @@ SUBDIR context:
     ProxyPassReverse /groupdav/ http://127.0.0.1:2000/groupdav/
     ProxyPass /who_inner_html http://127.0.0.1:2000/who_inner_html
     ProxyPassReverse /who_inner_html http://127.0.0.1:2000/who_inner_html
-# make apache give away static content like images...
+# The following line is optional.  It allows WebCit's static content
+# such as images to be served directly by Apache.
     alias /static /var/lib/citadel/www/static
 </VirtualHost>
- 
- CONCLUSION
- ----------
- 
- That's all you need to know to get started.  If you have any questions or
-comments, please visit UNCENSORED! BBS, the home of Citadel, at
-uncensored.citadel.org.
-
 
+  
  ADVANCED CONFIGURE OPTIONS
  --------------------------
  
- To make webcit integrate smothly into your system there are several options available.
---with-staticdir defines where webcit should put'n search its templates and images. If you
-want to go with a different Installation location then the point it is accessed at runtime, 
+If you are building packages and prefer not to have WebCit reside entirely in
+a single directory, there are several compile-time options available.
+
+--with-staticdir defines where webcit should locate and search its templates and images. If you
+want to go with a different installation location then the point at which it is accessed at runtime, 
 you can use --with-staticrundir. This option is meant to ease your needs if you're going
 to install the static files as 'examples' in a location like /usr/share/doc/webcit/examples, 
 and enable the user to copy them over to another dir (like /var/lib/citadel/www), where 
 they're accessed at runtime. (The debian instatll scripts provided with this package 
 do this to preserve user changes to the template system, see debian/citadel-webcit.postinstall)
 
-Further there are possibilities to load the tiny_mce editor into a system uniq location. Webcit 
-uses this standard component compose its messages for mails and postings. Several webcit installations
-that may differ in design but use the same tiny_mce (which is the default that webcit ships with)
+Also, there are possibilities to load the TinyMCE editor into a system-wide location.  WebCit 
+uses this standard component to compose its messages for messages and postings. Several WebCit installations
+that may differ in design but use the same TinyMCE (which is the default that WebCit ships with)
 (set --with-editordir for that, it defaults to the dir the templates go)
+
+
+ CONCLUSION
+ ----------
+ 
+ That's all you need to know to get started.  If you have any questions or
+comments, please visit UNCENSORED! BBS, the home of Citadel, at
+uncensored.citadel.org.
+
+

diff --git a/webcit/src/calendar_view.c b/webcit/src/calendar_view.c
index ce8a1155a6c8585df3bccdb2367a6eb12349d67c..798579c7ec18ab9e0805951dcbb50430750f3150 100644 (file)
--- a/webcit/src/calendar_view.c
+++ b/webcit/src/calendar_view.c
@@ -136,7 +136,7 @@ void calendar_month_view_display_events(time_t thetime) {
                                                        }
                                                        else {
                                                                tt = icaltime_as_timet(t);
-                                                               fmt_date(buf, tt, 0);
+                                                               fmt_date(buf, tt, 1);
                                                                wprintf("<i>%s</i> %s<br>",
                                                                        _("Starting date/time:"), buf);
                                                        }
@@ -147,7 +147,7 @@ void calendar_month_view_display_events(time_t thetime) {
                                                if (q != NULL) {
                                                        t = icalproperty_get_dtend(q);
                                                        tt = icaltime_as_timet(t);
-                                                       fmt_date(buf, tt, 0);
+                                                       fmt_date(buf, tt, 1);
                                                        wprintf("<i>%s</i> %s<br>",
                                                                _("Ending date/time:"), buf);
                                                }

diff --git a/webcit/static/BubbleTooltips.js b/webcit/static/BubbleTooltips.js
index ea5f846ab2f36d059719a16b4bbf7fb51549f67d..74a174d1dfc8fa3f9878066654c4d248464f20b3 100644 (file)
--- a/webcit/static/BubbleTooltips.js
+++ b/webcit/static/BubbleTooltips.js
@@ -1,8 +1,13 @@
 /*
  * JavaScript code to create "bubble tooltips"
+ * 
+ * Copyright (C) 2006 Alessandro Fulciniti [http://web-graphics.com]
+ * Copyright (C) 2006 Art Cancro [http://www.citadel.org]
+ *
+ * The original version of this module was released into the public
+ * domain.  This version is distributed as part of the Citadel system
+ * under the terms of the GNU General Public License v2.
  *
- * This is largely based on code written by Alessandro Fulciniti
- * http://pro.html.it - http://web-graphics.com
  */
 
 function btt_enableTooltips(id)