* Replaced all instances of the name "Citadel/UX" with "Citadel"

* Installed the "simple logo" in the iconbar

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 7814c408702643e2c9a15d4719389c2339982b91..b557ad02754188d3890cf5b1e624fa3223a1e8d0 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
 $Log$

+Revision 522.25  2004/08/11 03:49:15  ajc
+* Replaced all instances of the name "Citadel/UX" with "Citadel"
+* Installed the "simple logo" in the iconbar
+

 Revision 522.24  2004/08/09 03:11:20  ajc
 * Changed DOCTYPE to HTML 3.2 because that's really what it resembles
 
 Revision 522.24  2004/08/09 03:11:20  ajc
 * Changed DOCTYPE to HTML 3.2 because that's really what it resembles
 


@@ -231,7 +235,7 @@ Revision 506.8  2004/04/21 02:19:41  ajc
   ).  Still doesn't work with Internet Monopolizer, though.
 
 Revision 506.7  2004/04/20 02:32:44  ajc
   ).  Still doesn't work with Internet Monopolizer, though.
 
 Revision 506.7  2004/04/20 02:32:44  ajc

-* Allow setup to run seamlessly from within the Citadel/UX Ridiculously
+* Allow setup to run seamlessly from within the Citadel Ridiculously

   Easy Installer by observing the values of environment variables
   CITADEL_INSTALLER, CITADEL, and WEBCIT.
 
   Easy Installer by observing the values of environment variables
   CITADEL_INSTALLER, CITADEL, and WEBCIT.
 


@@ -1934,7 +1938,7 @@ Thu Dec 17 20:38:00 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Added goto private rooms
 
 Wed Dec 16 16:23:58 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Added goto private rooms
 
 Wed Dec 16 16:23:58 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>

-       * Replace "Citadel/UX" in menu bar with the Citadel/UX logo
+       * Replace "Citadel" in menu bar with the Citadel logo

 
 1998-12-14 Nathan Bryant <bryant@cs.usm.maine.edu>
        * automatically regenerate Makefile when Makefile.in changes
 
 1998-12-14 Nathan Bryant <bryant@cs.usm.maine.edu>
        * automatically regenerate Makefile when Makefile.in changes

diff --git a/webcit/README.txt b/webcit/README.txt
index 6151b71753968efaa8ca261d999b5c5a91516594..c7068153725203a4f85b66b852fa9e8fed96d664 100644 (file)
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -1,4 +1,4 @@
-                      WEBCIT for the Citadel/UX System
+                        WEBCIT for the Citadel System

                                version 5.20
  
    Copyright (C) 1996-2004 by the authors.  Portions written by:
                                version 5.20
  
    Copyright (C) 1996-2004 by the authors.  Portions written by:


@@ -15,7 +15,7 @@ Public License.  Please read COPYING.txt for more licensing information.
  INTRODUCTION
  ------------
  
  INTRODUCTION
  ------------
  

- Citadel/UX is a sophisticated BBS and groupware package which allows multiple
+ Citadel is a sophisticated BBS and groupware package which allows multiple

 users to simultaneously access the system using a variety of user interfaces.
 This package (WebCit) is a "middleware" package which presents an HTML/HTTP
 user interface to the Citadel system.
 users to simultaneously access the system using a variety of user interfaces.
 This package (WebCit) is a "middleware" package which presents an HTML/HTTP
 user interface to the Citadel system.


@@ -103,10 +103,10 @@ the "webserver" program:
      service.  If you want to do both HTTP and HTTPS, you can simply run two
      instances of WebCit on two different ports.
  
      service.  If you want to do both HTTP and HTTPS, you can simply run two
      instances of WebCit on two different ports.
  

-  -> remotehost: the name or IP address of the host on which your Citadel/UX
+  -> remotehost: the name or IP address of the host on which your Citadel

      server is running.  The default is "localhost".
  
      server is running.  The default is "localhost".
  

-  -> remoteport: the port number on which your Citadel/UX server is running.
+  -> remoteport: the port number on which your Citadel server is running.

      The default is port 504, the IANA-designated standard port for Citadel.
  
   -> "uds" is a keyword which tells WebCit that you wish to connect to a
      The default is port 504, the IANA-designated standard port for Citadel.
  
   -> "uds" is a keyword which tells WebCit that you wish to connect to a


@@ -124,7 +124,7 @@ the "webserver" program:
 in its "static" subdirectory.  All site-specific graphics, however, are
 fetched from the Citadel server.
  
 in its "static" subdirectory.  All site-specific graphics, however, are
 fetched from the Citadel server.
  

- The "images" directory on a Citadel/UX system contains these graphics.  The
+ The "images" directory on a Citadel system contains these graphics.  The

 ones which you may be interested in are:
  
  -> background.gif: a background texture displayed under all web pages
 ones which you may be interested in are:
  
  -> background.gif: a background texture displayed under all web pages


@@ -177,5 +177,5 @@ authority.
  ----------
  
  That's all you need to know to get started.  If you have any questions or
  ----------
  
  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/UX, at
+comments, please visit UNCENSORED! BBS, the home of Citadel, at

 uncensored.citadel.org.
 uncensored.citadel.org.

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index e5f5a476803153af1955945fd2f1b3acbca8a104..07650d4fe02bfc98ca0ab37a6d8fddffdfdc4efd 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -258,11 +258,11 @@ void do_iconbar(void) {
        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
                "<SPAN CLASS=\"powered_by\"><P>"
                "<A HREF=\"http://uncensored.citadel.org/citadel\" "
        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
                "<SPAN CLASS=\"powered_by\"><P>"
                "<A HREF=\"http://uncensored.citadel.org/citadel\" "

-               "TITLE=\"Find out more about Citadel/UX\" TARGET=\"aboutcit\" "
+               "TITLE=\"Find out more about Citadel\" TARGET=\"aboutcit\" "

                "onMouseOver=\"window.status='Find out more about "
                "onMouseOver=\"window.status='Find out more about "

-               "Citadel/UX'; return true;\">powered by<BR><IMG "
+               "Citadel'; return true;\">powered by<BR><IMG "

                "BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "

-               "SRC=\"/static/citadel-logo.jpg\" ALT=\"CITADEL/UX\"></A>"
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\"></A>"

                "</P></SPAN>\n"
        );
 
                "</P></SPAN>\n"
        );
 


@@ -493,7 +493,7 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "

-               "SRC=\"/static/citadel-logo.jpg\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"&nbsp;\">"

                "</TD><TD>"
                "<B>Citadel logo</B><BR>"
                "Displays the &quot;Powered by Citadel&quot; graphic"
                "</TD><TD>"
                "<B>Citadel logo</B><BR>"
                "Displays the &quot;Powered by Citadel&quot; graphic"

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 3fe80164c0d0eb58ba94f4d7fc98a8d6c56c41cc..e5f5fe6b416499aa3a5ce2b6631e21a2b0b0e92a 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -140,8 +140,8 @@ void fmout(FILE *fp, char *align)
                intext = 1;
 
                /* Quoted text should be displayed in italics and in a
                intext = 1;
 
                /* Quoted text should be displayed in italics and in a

-                * different colour.  This code understands Citadel/UX
-                * style " >" quotes and will convert to <BLOCKQUOTE> tags.
+                * different colour.  This code understands Citadel-style
+                * " >" quotes and will convert to <BLOCKQUOTE> tags.

                 */
                if ((bq == 0) && (!strncmp(buf, " >", 2))) {
                        wprintf("<BLOCKQUOTE>");
                 */
                if ((bq == 0) && (!strncmp(buf, " >", 2))) {
                        wprintf("<BLOCKQUOTE>");

diff --git a/webcit/static/citadel-logo.gif b/webcit/static/citadel-logo.gif
new file mode 100644 (file)
index 0000000..8ac6e11
Binary files /dev/null and b/webcit/static/citadel-logo.gif differ

diff --git a/webcit/static/citadel-logo.jpg b/webcit/static/citadel-logo.jpg
deleted file mode 100644 (file)
index 865cb21..0000000
Binary files a/webcit/static/citadel-logo.jpg and /dev/null differ

diff --git a/webcit/static/iconbar.html b/webcit/static/iconbar.html
index 6febfbbfc2950ab42ec010a0b44589c8d88fb418..688a054f17560e9f53f243d41db41365f6fb82fc 100644 (file)
--- a/webcit/static/iconbar.html
+++ b/webcit/static/iconbar.html
@@ -56,10 +56,10 @@ TARGET="workspace">customize this menu</A>
 <BR>
 
 <SPAN CLASS="powered_by">
 <BR>
 
 <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>
+<A HREF="http://www.citadel.org"
+       TITLE="Find out more about Citadel" TARGET="aboutcit"
+       onMouseOver="window.status='Find out more about Citadel'; return true;">powered by<BR><IMG
+       BORDER="0" WIDTH="48" HEIGHT="48" SRC="/static/citadel-logo.gif" ALT="CITADEL"></A>

 </SPAN>
 
 </CENTER>
 </SPAN>
 
 </CENTER>

diff --git a/webcit/static/menubar.html b/webcit/static/menubar.html
index bdfa3adff50d93f479c9412573b952529ec68427..9b573ac637bc0456af051783fc46e93cb1fe19c1 100644 (file)
--- a/webcit/static/menubar.html
+++ b/webcit/static/menubar.html
@@ -81,10 +81,10 @@
 
 <BR><BR>
 
 
 <BR><BR>
 

-<A HREF="http://uncensored.citadel.org/citadel" TARGET="aboutcit"
-       onMouseOver="window.status='Find out more about Citadel/UX'; return true;"><FONT 
+<A HREF="http://www.citadel.org" TARGET="aboutcit"
+       onMouseOver="window.status='Find out more about Citadel'; return true;"><FONT 

 SIZE=-1 COLOR="#000000">
 POWERED BY<BR></FONT>
 SIZE=-1 COLOR="#000000">
 POWERED BY<BR></FONT>

-<IMG SRC="/static/citadel-logo.jpg" WIDTH=75 HEIGHT=76 BORDER=0 ALT="CITADEL/UX"></A>
+<IMG SRC="/static/citadel-logo.gif" WIDTH=75 HEIGHT=76 BORDER=0 ALT="CITADEL"></A>

 
 </CENTER>
 
 </CENTER>

diff --git a/webcit/webcit.lsm b/webcit/webcit.lsm
index b5d70d634361f68ed897cb47287ff569ef33373a..79b29a3630df7f7c8edbca734ff6814f5fbbb04e 100644 (file)
--- a/webcit/webcit.lsm
+++ b/webcit/webcit.lsm
@@ -2,19 +2,19 @@ Begin4
 Title: WebCit
 Version: 5.06
 Entered-date: Sat Apr 10 00:32:25 EDT 2004
 Title: WebCit
 Version: 5.06
 Entered-date: Sat Apr 10 00:32:25 EDT 2004

-Description: The Web front-end for Citadel/UX.
-        WebCit provides a high performance Web server for your Citadel/UX
+Description: The Web front-end for Citadel.
+        WebCit provides a high performance Web server for your Citadel

        server.  It does not require any other Web server to operate, and
        uses a proven worker thread model to satisfy large numbers of
        client requests.  WebCit provides web-based mail, messaging,
        server.  It does not require any other Web server to operate, and
        uses a proven worker thread model to satisfy large numbers of
        client requests.  WebCit provides web-based mail, messaging,

-       calendaring and instant messaging for Citadel/UX servers.
+       calendaring and instant messaging for Citadel servers.

 Keywords: citadel web calendar mail bbs
 Author: Art Cancro <ajc@uncensored.citadel.org>
 Keywords: citadel web calendar mail bbs
 Author: Art Cancro <ajc@uncensored.citadel.org>

-Maintained-by: Citadel/UX Developers <devel@citadel.org>
+Maintained-by: Citadel Developers <devel@citadel.org>

 Primary-site: http://uncensored.citadel.org/citadel/
 Alternate-site: http://www.tux.org/pub/net/citadel/
 Original-site: http://uncensored.citadel.org/citadel/
 Platforms: Unix and Unix-like systems.
 Primary-site: http://uncensored.citadel.org/citadel/
 Alternate-site: http://www.tux.org/pub/net/citadel/
 Original-site: http://uncensored.citadel.org/citadel/
 Platforms: Unix and Unix-like systems.

-        WebCit runs on the same platforms as the Citadel/UX server.
+        WebCit runs on the same platforms as the Citadel server.

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End