From: Art Cancro Date: Wed, 11 Aug 2004 03:49:18 +0000 (+0000) Subject: * Replaced all instances of the name "Citadel/UX" with "Citadel" X-Git-Tag: v7.86~5320 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=c0a3e8894b0d554b73d404ea496a1836db6e0ed9;p=citadel.git * 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 7814c4087..b557ad027 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,8 @@ $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 @@ -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 -* 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. @@ -1934,7 +1938,7 @@ Thu Dec 17 20:38:00 EST 1998 Art Cancro * Added goto private rooms Wed Dec 16 16:23:58 EST 1998 Art Cancro - * 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 * automatically regenerate Makefile when Makefile.in changes diff --git a/webcit/README.txt b/webcit/README.txt index 6151b7175..c70681537 100644 --- 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: @@ -15,7 +15,7 @@ Public License. Please read COPYING.txt for more licensing information. 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. @@ -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. - -> 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". - -> 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 @@ -124,7 +124,7 @@ the "webserver" program: 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 @@ -177,5 +177,5 @@ authority. ---------- 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. diff --git a/webcit/iconbar.c b/webcit/iconbar.c index e5f5a4768..07650d4fe 100644 --- 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( "

" "powered by
powered by
\"CITADEL/UX\"" + "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\">" "

\n" ); @@ -493,7 +493,7 @@ void display_customize_iconbar(void) { "VALUE=\"yes\" %s>" "" "\" \"" + "SRC=\"/static/citadel-logo.gif\" ALT=\" \">" "" "Citadel logo
" "Displays the "Powered by Citadel" graphic" diff --git a/webcit/serv_func.c b/webcit/serv_func.c index 3fe80164c..e5f5fe6b4 100644 --- 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 - * different colour. This code understands Citadel/UX - * style " >" quotes and will convert to
tags. + * different colour. This code understands Citadel-style + * " >" quotes and will convert to
tags. */ if ((bq == 0) && (!strncmp(buf, " >", 2))) { wprintf("
"); diff --git a/webcit/static/citadel-logo.gif b/webcit/static/citadel-logo.gif new file mode 100644 index 000000000..8ac6e119c 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 index 865cb21da..000000000 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 6febfbbfc..688a054f1 100644 --- a/webcit/static/iconbar.html +++ b/webcit/static/iconbar.html @@ -56,10 +56,10 @@ TARGET="workspace">customize this menu
-powered by
CITADEL/UX +powered by
CITADEL diff --git a/webcit/static/menubar.html b/webcit/static/menubar.html index bdfa3adff..9b573ac63 100644 --- a/webcit/static/menubar.html +++ b/webcit/static/menubar.html @@ -81,10 +81,10 @@

- POWERED BY
 -CITADEL/UX +CITADEL diff --git a/webcit/webcit.lsm b/webcit/webcit.lsm index b5d70d634..79b29a363 100644 --- 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 -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, - calendaring and instant messaging for Citadel/UX servers. + calendaring and instant messaging for Citadel servers. Keywords: citadel web calendar mail bbs Author: Art Cancro -Maintained-by: Citadel/UX Developers +Maintained-by: Citadel Developers 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