* Removed the "pull_quote" style and used the <BLOCKQUOTE> tag instead. It

  has a more predictable and attractive behavior, and can still be
  overridden in the style sheet if the site operator wants to.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 8d6960a17eca4b57c2adedcfe07c1d3e74242b5c..d9589489ef2686e0c9215fdae0181617c81c286d 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 522.22  2004/08/05 02:47:21  ajc
+* Removed the "pull_quote" style and used the <BLOCKQUOTE> tag instead.  It
+  has a more predictable and attractive behavior, and can still be
+  overridden in the style sheet if the site operator wants to.
+
 Revision 522.21  2004/08/04 03:52:23  ajc
 * Tasks view is now pretty.
 * Tasks view now displays date due for each task.
@@ -2000,3 +2005,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/messages.c b/webcit/messages.c
index 37fc21196f65c7a3b48ad47b00c9a6f3f8ae723f..a9a07345e708ded32c5b8338b9a7aef2b049de80 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -577,11 +577,11 @@ void read_message(long msgnum) {
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
                        ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                               wprintf("<SPAN CLASS=\"pull_quote\">");
+                               wprintf("<BLOCKQUOTE>");
                                bq = 1;
                        } else if ((bq == 1) &&
                                (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</SPAN>");
+                               wprintf("</BLOCKQUOTE>");
                                bq = 0;
                        }
                        wprintf("<TT>");

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 924f0a0892a87dd34a248ab18277d61246e831d4..3fe80164c0d0eb58ba94f4d7fc98a8d6c56c41cc 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -140,18 +140,19 @@ void fmout(FILE *fp, char *align)
                intext = 1;
 
                /* Quoted text should be displayed in italics and in a
-                * different colour.  This code understands both Citadel/UX
-                * style " >" quotes and FordBoard-style " :-)" quotes.
+                * different colour.  This code understands Citadel/UX
+                * style " >" quotes and will convert to <BLOCKQUOTE> tags.
                 */
-               if ((bq == 0) &&
-                   ((!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                       wprintf("<SPAN CLASS=\"pull_quote\">");
+               if ((bq == 0) && (!strncmp(buf, " >", 2))) {
+                       wprintf("<BLOCKQUOTE>");
                        bq = 1;
-               } else if ((bq == 1) &&
-                 (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                       wprintf("</SPAN>");
+               } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
+                       wprintf("</BLOCKQUOTE>");
                        bq = 0;
                }
+               if ((bq == 1) && (!strncmp(buf, " >", 2))) {
+                       strcpy(buf, &buf[2]);
+               }
                /* Activate embedded URL's */
                url(buf);
 

diff --git a/webcit/static/style.css b/webcit/static/style.css
index 2b199447f3f6a0a94b39f64d3e0d9aa513aca8d7..31e74b3fb44a26cd2b9ea498575eeaae8ffb64da 100644 (file)
--- a/webcit/static/style.css
+++ b/webcit/static/style.css
@@ -55,13 +55,6 @@ a:active {
        font-style: italic;
 }
 
-.pull_quote {
-       font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-       font-size: 7pt;
-       font-style: italic;
-       color: #000044;
-}
-
 .tablabel {
        font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
        font-size: 10pt;