From bdc6977680ff6b3a8ab591947570ae54695de23b Mon Sep 17 00:00:00 2001 From: "Eric J. Bowersox" Date: Mon, 22 Oct 2001 22:11:58 +0000 Subject: [PATCH] first round of NRPA changes: - added color customization in render-config.xml - added ability to scale size of Venice logo in footer - added ability to customize size of site logo, as well as add a hyperlink - moved to use of LOG4J 1.1.3, LOG4J now installed in Venice lib directory instead of in JRE extensions directory (only Java extensions should go in JRE extensions directory) - close to requiring JAXP 1.1 (will still work with 1.0 though) --- INSTALL | 10 +- build.xml | 10 +- etc/logging-config.xml | 6 +- etc/render-config.xml | 35 +++- lib/.gitignore | 1 + lib/README.lib | 2 +- .../silverwrist/util/DOMElementHelper.java | 44 ++++- .../servlets/format/AuditDataViewer.java | 12 +- .../servlets/format/CDBaseFormField.java | 14 +- .../format/CDBaseFormFieldReverse.java | 12 +- .../servlets/format/CDFormCategoryHeader.java | 25 +-- .../servlets/format/ColorSelectors.java | 60 +++++++ .../venice/servlets/format/ConfirmBox.java | 9 +- .../venice/servlets/format/ContentDialog.java | 6 +- .../servlets/format/ContentMenuPanel.java | 4 +- .../venice/servlets/format/ErrorBox.java | 9 +- .../venice/servlets/format/RenderConfig.java | 150 ++++++++++++++++-- .../venice/servlets/format/RenderData.java | 18 +++ .../servlets/format/SideBoxConferences.java | 10 +- .../venice/servlets/format/SideBoxSIGs.java | 11 +- .../servlets/format/TextMessageDialog.java | 4 +- .../venice/servlets/format/TopDisplay.java | 16 +- web/format/admin_find.jsp | 6 +- web/format/attach_form.jsp | 2 +- web/format/base.jsp | 50 +++--- web/format/conf_activity.jsp | 24 +-- web/format/conf_member.jsp | 15 +- web/format/conf_sequence.jsp | 17 +- web/format/conferences.jsp | 2 +- web/format/find.jsp | 20 +-- web/format/hotlist.jsp | 2 +- web/format/invitation.jsp | 15 +- web/format/manage_aliases.jsp | 6 +- web/format/manage_conf.jsp | 8 +- web/format/newsigwelcome.jsp | 2 +- web/format/newtopic.jsp | 12 +- web/format/posts.jsp | 60 +++---- web/format/preview.jsp | 10 +- web/format/report_conf.jsp | 2 +- web/format/sig_member.jsp | 14 +- web/format/sigcatbrowser.jsp | 4 +- web/format/siglist.jsp | 9 +- web/format/sigprofile.jsp | 4 +- web/format/sigwelcome.jsp | 2 +- web/format/slippage.jsp | 17 +- web/format/top_content.jsp | 30 ++-- web/format/topics.jsp | 2 +- web/format/userprofile.jsp | 11 +- 48 files changed, 553 insertions(+), 261 deletions(-) create mode 100644 src/com/silverwrist/venice/servlets/format/ColorSelectors.java diff --git a/INSTALL b/INSTALL index d5bd530..b7e47eb 100644 --- a/INSTALL +++ b/INSTALL @@ -15,7 +15,7 @@ Software requirements: * JavaMail API version 1.2, available from http://java.sun.com. * JavaBeans Activation Framework (JAF) version 1.0.1, available from http://java.sun.com. (Required by JavaMail.) - * Apache Jakarta LOG4J library 1.0.x, available from + * Apache Jakarta LOG4J library 1.1.x, available from http://jakarta.apache.org. * MySQL 3.23.x (get the most recent 3.23 version), available from http://www.mysql.com. @@ -29,8 +29,8 @@ Software requirements: otherwise there will be a problem with file uploads (Bug#526 in the Apache Jakarta Bug Database). - It is recommended that you install JAXP, JSSE, JavaMail, JAF, and LOG4J - by copying or symbolically linking their JAR files to the /jre/lib/ext + It is recommended that you install JAXP, JSSE, JavaMail, and JAF by copying + or symbolically linking their JAR files to the /jre/lib/ext directory, to avoid creating a huge CLASSPATH variable. The JDK /bin subdirectory should be in your PATH, naturally. @@ -47,6 +47,10 @@ Setting Up: deployment directory, and three parameters in web.xml point to them, so those parameters will have to be modified. + The MySQL JDBC driver (mysql.jar) and the LOG4J JAR file (log4j.jar) need + to be copied to the "lib" subdirectory. The build process will copy them + to the "WEB-INF/lib" subdirectory of the deployment directory. + Also modify the three configuration files to suit your system layout. Each file is reasonably commented, so you should be able to figure it out based on your directory location and your Tomcat configuration. diff --git a/build.xml b/build.xml index eccdc28..06cd4e4 100644 --- a/build.xml +++ b/build.xml @@ -56,8 +56,14 @@ - + + + + + + + + diff --git a/etc/logging-config.xml b/etc/logging-config.xml index 74f530c..ced654d 100644 --- a/etc/logging-config.xml +++ b/etc/logging-config.xml @@ -1,5 +1,5 @@ - + - + @@ -44,7 +44,7 @@ - + diff --git a/etc/render-config.xml b/etc/render-config.xml index 9c2c364..9d3b596 100644 --- a/etc/render-config.xml +++ b/etc/render-config.xml @@ -41,6 +41,33 @@ Arial, Helvetica + + + #9999FF + #6666CC + white + yellow + #9999FF + black + white + black + #3333AA + silver + #660000 + #6666CC + white + #9999FF + black + #006600 + white + #660000 + white + + + + 100 + @@ -51,8 +78,12 @@ /venice/static/ - - /venice/images/powered-by-venice.gif + + /venice/images/powered-by-venice.gif + diff --git a/lib/.gitignore b/lib/.gitignore index a55664c..f354abd 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -1 +1,2 @@ +log4j.jar mysql.jar diff --git a/lib/README.lib b/lib/README.lib index 092afea..8771ef0 100644 --- a/lib/README.lib +++ b/lib/README.lib @@ -1,2 +1,2 @@ When you download the MySQL JDBC driver, put the "mysql.jar" file in this -directory. +directory. Also put the Apache Jakarta LOG4J "log4j.jar" file here. diff --git a/src/com/silverwrist/util/DOMElementHelper.java b/src/com/silverwrist/util/DOMElementHelper.java index 06c84aa..c81995b 100644 --- a/src/com/silverwrist/util/DOMElementHelper.java +++ b/src/com/silverwrist/util/DOMElementHelper.java @@ -7,7 +7,7 @@ * WARRANTY OF ANY KIND, either express or implied. See the License for the specific * language governing rights and limitations under the License. * - * The Original Code is the Venice Web Community System. + * The Original Code is the Venice Web Communities System. * * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are @@ -21,19 +21,28 @@ import org.w3c.dom.*; public class DOMElementHelper { + /*-------------------------------------------------------------------------------- + * Attributes + *-------------------------------------------------------------------------------- + */ + private Element elt; // element housed by this helper class + /*-------------------------------------------------------------------------------- + * Constructor + *-------------------------------------------------------------------------------- + */ + public DOMElementHelper(Element elt) { this.elt = elt; } // end constructor - protected void finalize() - { - elt = null; - - } // end finalize + /*-------------------------------------------------------------------------------- + * Internal static operations + *-------------------------------------------------------------------------------- + */ private static String getTextOfElement(Element e) { @@ -64,6 +73,11 @@ public class DOMElementHelper } // end getTextOfElement + /*-------------------------------------------------------------------------------- + * External operations + *-------------------------------------------------------------------------------- + */ + public Element getElement() { return elt; @@ -110,6 +124,24 @@ public class DOMElementHelper } // end hasChildElement + public Integer getAttributeInt(String name) + { + String tmp = elt.getAttribute(name); + if (StringUtil.isStringEmpty(tmp)) + return null; + try + { // convert to an Integer + return new Integer(tmp); + + } // end try + catch (NumberFormatException nfe) + { // return a null value on error + return null; + + } // end catch + + } // end getAttributeInt + } // end DOMElementHelper diff --git a/src/com/silverwrist/venice/servlets/format/AuditDataViewer.java b/src/com/silverwrist/venice/servlets/format/AuditDataViewer.java index ea95625..037b721 100644 --- a/src/com/silverwrist/venice/servlets/format/AuditDataViewer.java +++ b/src/com/silverwrist/venice/servlets/format/AuditDataViewer.java @@ -22,7 +22,7 @@ import java.util.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; -public class AuditDataViewer implements ContentRender +public class AuditDataViewer implements ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Attributes @@ -85,10 +85,10 @@ public class AuditDataViewer implements ContentRender rdat.writeContentHeader(out,title,null); // Write the informational and navigational table - out.write("
" + rdat.getStdFontTag(null,2)); - out.write("\nDisplaying records " + (offset+1) + " to " + last_index + " of " - + total_count + "\n"); - out.write("\n"); + out.write("
" + + rdat.getStdFontTag(CONTENT_FOREGROUND,2) + "\nDisplaying records " + (offset+1) + + " to " + last_index + " of " + total_count + "\n" + + "\n"); if (prev_url==null) out.write("\"\"\n"); @@ -107,7 +107,7 @@ public class AuditDataViewer implements ContentRender out.write("\n
\n"); // Start writing the table containing the actual audit records. - String tb_font = rdat.getStdFontTag(null,2); + String tb_font = rdat.getStdFontTag(CONTENT_FOREGROUND,2); out.write("\n"); out.write("\n\n"); out.write("\n"); diff --git a/src/com/silverwrist/venice/servlets/format/CDBaseFormField.java b/src/com/silverwrist/venice/servlets/format/CDBaseFormField.java index 6a71466..2aa8e43 100644 --- a/src/com/silverwrist/venice/servlets/format/CDBaseFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDBaseFormField.java @@ -22,7 +22,7 @@ import java.io.IOException; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.ValidationException; -public abstract class CDBaseFormField implements CDFormField +public abstract class CDBaseFormField implements CDFormField, ColorSelectors { private String name; private String caption; @@ -67,17 +67,15 @@ public abstract class CDBaseFormField implements CDFormField public void renderHere(Writer out, RenderData rdat) throws IOException { - out.write("\n\n\n\n\n\n"); diff --git a/src/com/silverwrist/venice/servlets/format/CDBaseFormFieldReverse.java b/src/com/silverwrist/venice/servlets/format/CDBaseFormFieldReverse.java index d955ef1..28d976c 100644 --- a/src/com/silverwrist/venice/servlets/format/CDBaseFormFieldReverse.java +++ b/src/com/silverwrist/venice/servlets/format/CDBaseFormFieldReverse.java @@ -22,7 +22,7 @@ import java.io.IOException; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.ValidationException; -public abstract class CDBaseFormFieldReverse implements CDFormField +public abstract class CDBaseFormFieldReverse implements CDFormField, ColorSelectors { private String name; private String caption; @@ -69,14 +69,12 @@ public abstract class CDBaseFormFieldReverse implements CDFormField { out.write("\n\n\n\n\n"); diff --git a/src/com/silverwrist/venice/servlets/format/CDFormCategoryHeader.java b/src/com/silverwrist/venice/servlets/format/CDFormCategoryHeader.java index ffa9e80..82e65ab 100644 --- a/src/com/silverwrist/venice/servlets/format/CDFormCategoryHeader.java +++ b/src/com/silverwrist/venice/servlets/format/CDFormCategoryHeader.java @@ -23,7 +23,7 @@ import javax.servlet.ServletRequest; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.ValidationException; -public class CDFormCategoryHeader implements CDFormField +public class CDFormCategoryHeader implements CDFormField, ColorSelectors { private String caption; private String rtext; @@ -55,25 +55,14 @@ public class CDFormCategoryHeader implements CDFormField public void renderHere(Writer out, RenderData rdat) throws IOException { - out.write("\n"); } // end renderHere diff --git a/src/com/silverwrist/venice/servlets/format/ColorSelectors.java b/src/com/silverwrist/venice/servlets/format/ColorSelectors.java new file mode 100644 index 0000000..e87040d --- /dev/null +++ b/src/com/silverwrist/venice/servlets/format/ColorSelectors.java @@ -0,0 +1,60 @@ +/* + * The contents of this file are subject to the Mozilla Public License Version 1.1 + * (the "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at . + * + * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT + * WARRANTY OF ANY KIND, either express or implied. See the License for the specific + * language governing rights and limitations under the License. + * + * The Original Code is the Venice Web Communities System. + * + * The Initial Developer of the Original Code is Eric J. Bowersox , + * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are + * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. + * + * Contributor(s): + */ +package com.silverwrist.venice.servlets.format; + +public interface ColorSelectors +{ + public static final int FRAME_BACKGROUND = 0; + + public static final int TITLE_BACKGROUND = 1; + + public static final int TITLE_FOREGROUND = 2; + + public static final int TITLE_LINK = 3; + + public static final int LEFT_BACKGROUND = 4; + + public static final int LEFT_FOREGROUND = 5; + + public static final int CONTENT_BACKGROUND = 6; + + public static final int CONTENT_FOREGROUND = 7; + + public static final int CONTENT_HEADER = 8; + + public static final int CONTENT_DISABLED = 9; + + public static final int CONTENT_ERROR = 10; + + public static final int SIDEBOX_TITLE_BACKGROUND = 11; + + public static final int SIDEBOX_TITLE_FOREGROUND = 12; + + public static final int SIDEBOX_CONTENT_BACKGROUND = 13; + + public static final int SIDEBOX_CONTENT_FOREGROUND = 14; + + public static final int CONFIRM_TITLE_BACKGROUND = 15; + + public static final int CONFIRM_TITLE_FOREGROUND = 16; + + public static final int ERROR_TITLE_BACKGROUND = 17; + + public static final int ERROR_TITLE_FOREGROUND = 18; + +} // end class ColorSelectors diff --git a/src/com/silverwrist/venice/servlets/format/ConfirmBox.java b/src/com/silverwrist/venice/servlets/format/ConfirmBox.java index b8a2c24..73a1bc1 100644 --- a/src/com/silverwrist/venice/servlets/format/ConfirmBox.java +++ b/src/com/silverwrist/venice/servlets/format/ConfirmBox.java @@ -24,7 +24,7 @@ import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.util.StringUtil; -public class ConfirmBox implements ContentRender +public class ConfirmBox implements ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Static data members @@ -111,10 +111,11 @@ public class ConfirmBox implements ContentRender public void renderHere(Writer out, RenderData rdat) throws IOException { out.write("

" + tb_font + "Date/Time" + tb_font + "Description
"); - if (!enabled) - out.write(""); - out.write(StringUtil.encodeHTML(caption)); + out.write("
" + + StringUtil.encodeHTML(caption)); if (caption2!=null) out.write(" " + StringUtil.encodeHTML(caption2)); - if (!enabled) - out.write(""); + out.write(":"); if (required) out.write(rdat.getRequiredBullet()); - out.write(":"); + out.write(""); renderActualField(out,rdat); out.write("
"); renderActualField(out,rdat); - out.write(""); - if (!enabled) - out.write(""); - out.write(StringUtil.encodeHTML(caption)); + out.write("" + + StringUtil.encodeHTML(caption)); if (caption2!=null) out.write(" " + StringUtil.encodeHTML(caption2)); - if (!enabled) - out.write(""); + out.write(""); if (required) out.write(rdat.getRequiredBullet()); out.write("
"); - if (!enabled) - out.write(""); - out.write("" + StringUtil.encodeHTML(caption) + ":"); - if (!enabled) - out.write(""); - out.write(""); + out.write("
" + + StringUtil.encodeHTML(caption) + ":"); if (rtext==null) out.write(" "); - else - { // display in the correct state - if (!enabled) - out.write(""); - out.write(StringUtil.encodeHTML(rtext)); - if (!enabled) - out.write(""); - - } // end else - + else // display in the correct state + out.write("" + + StringUtil.encodeHTML(rtext) + ""); out.write("
"); - out.write("\n\n\n\n"); diff --git a/src/com/silverwrist/venice/servlets/format/ErrorBox.java b/src/com/silverwrist/venice/servlets/format/ErrorBox.java index 96d8321..bf3ba55 100644 --- a/src/com/silverwrist/venice/servlets/format/ErrorBox.java +++ b/src/com/silverwrist/venice/servlets/format/ErrorBox.java @@ -22,7 +22,7 @@ import java.io.IOException; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.servlets.VeniceServletResult; -public class ErrorBox extends VeniceServletResult implements ContentRender +public class ErrorBox extends VeniceServletResult implements ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Attributes @@ -69,10 +69,11 @@ public class ErrorBox extends VeniceServletResult implements ContentRender public void renderHere(Writer out, RenderData rdat) throws IOException { out.write("

\n"); - out.write(rdat.getStdFontTag("white",3) + StringUtil.encodeHTML(title) + "\n"); + out.write("
\n"); + out.write(rdat.getStdFontTag(CONFIRM_TITLE_FOREGROUND,3) + StringUtil.encodeHTML(title) + "\n"); out.write("
\n"); - out.write(rdat.getStdFontTag(null,3) + "

" + StringUtil.encodeHTML(message) + "

\n"); + out.write(rdat.getStdFontTag(CONTENT_FOREGROUND,3) + "

" + StringUtil.encodeHTML(message) + "

\n"); out.write(""); out.write("\"Yes\"  \n"); diff --git a/src/com/silverwrist/venice/servlets/format/ContentDialog.java b/src/com/silverwrist/venice/servlets/format/ContentDialog.java index 158aa6b..c1db6b8 100644 --- a/src/com/silverwrist/venice/servlets/format/ContentDialog.java +++ b/src/com/silverwrist/venice/servlets/format/ContentDialog.java @@ -24,7 +24,7 @@ import javax.servlet.ServletRequest; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.ValidationException; -public class ContentDialog implements Cloneable, ContentRender +public class ContentDialog implements Cloneable, ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Attributes @@ -148,7 +148,7 @@ public class ContentDialog implements Cloneable, ContentRender if (error_message!=null) { // print the error message out.write("" - + "
\n" + rdat.getStdFontTag("#660000",3) + ""); + + "\n" + rdat.getStdFontTag(CONTENT_ERROR,3) + ""); out.write(StringUtil.encodeHTML(error_message)); out.write("\n
\n"); @@ -156,7 +156,7 @@ public class ContentDialog implements Cloneable, ContentRender // Output the start of the form out.write("

" + rdat.getStdFontTag(null,2) + "\n"); + out.write(rdat.getEncodedServletPath(action) + "\">" + rdat.getStdFontTag(CONTENT_FOREGROUND,2) + "\n"); enum = hidden_fields.keys(); while (enum.hasMoreElements()) diff --git a/src/com/silverwrist/venice/servlets/format/ContentMenuPanel.java b/src/com/silverwrist/venice/servlets/format/ContentMenuPanel.java index f5172fd..449f9c0 100644 --- a/src/com/silverwrist/venice/servlets/format/ContentMenuPanel.java +++ b/src/com/silverwrist/venice/servlets/format/ContentMenuPanel.java @@ -22,7 +22,7 @@ import java.io.Writer; import java.io.IOException; import com.silverwrist.util.StringUtil; -public class ContentMenuPanel implements Cloneable, ContentRender +public class ContentMenuPanel implements Cloneable, ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Internal class for storing content items @@ -127,7 +127,7 @@ public class ContentMenuPanel implements Cloneable, ContentRender out.write("
\"*\""); - out.write(rdat.getStdFontTag(null,2)); + out.write(rdat.getStdFontTag(CONTENT_FOREGROUND,2)); ContentMenuPanelItem item = (ContentMenuPanelItem)(it.next()); item.renderHere(out,rdat,params); out.write("
"); - out.write("
\n"); - out.write(rdat.getStdFontTag("white",3) + StringUtil.encodeHTML(title) + "\n"); + out.write("
\n"); + out.write(rdat.getStdFontTag(ERROR_TITLE_FOREGROUND,3) + StringUtil.encodeHTML(title) + "\n"); out.write("
\n"); - out.write(rdat.getStdFontTag(null,3) + "

" + StringUtil.encodeHTML(message) + "

\n"); + out.write(rdat.getStdFontTag(CONTENT_FOREGROUND,3) + "

" + StringUtil.encodeHTML(message) + "

\n"); if (back==null) out.write("Use your browser's Back button to go back.\n"); else diff --git a/src/com/silverwrist/venice/servlets/format/RenderConfig.java b/src/com/silverwrist/venice/servlets/format/RenderConfig.java index a638959..9514cf2 100644 --- a/src/com/silverwrist/venice/servlets/format/RenderConfig.java +++ b/src/com/silverwrist/venice/servlets/format/RenderConfig.java @@ -33,7 +33,7 @@ import com.silverwrist.venice.core.UserContext; import com.silverwrist.venice.servlets.Variables; import com.silverwrist.venice.servlets.format.menus.LeftMenu; -public class RenderConfig +public class RenderConfig implements ColorSelectors { /*-------------------------------------------------------------------------------- * Static data values @@ -45,6 +45,8 @@ public class RenderConfig private static Category logger = Category.getInstance(RenderConfig.class.getName()); + private static Map colornames_map; + /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- @@ -59,8 +61,13 @@ public class RenderConfig private String image_url; private String static_url; private String site_logo; + private int site_logo_width = 140; + private int site_logo_height = 80; + private String site_logo_linkURL = null; private HashMap stock_messages; private HashMap menus; + private String[] colors_array; + private int footer_logo_scale; /*-------------------------------------------------------------------------------- * Constructor @@ -125,6 +132,49 @@ public class RenderConfig if (logger.isDebugEnabled()) logger.debug("Font face: " + font_face); + Element colors_sect = render_sect_h.getSubElement("colors"); + if (colors_sect==null) + { // no tag - bail out now! + logger.fatal(" section has no element"); + throw new ConfigException("no found in section",render_sect); + + } // end if + + colors_array = new String[colornames_map.size()]; + int i; + NodeList colors_nlist = colors_sect.getChildNodes(); + for (i=0; i section - bail out now! @@ -156,16 +206,38 @@ public class RenderConfig if (logger.isDebugEnabled()) logger.debug("Static files path: " + static_url); - site_logo = paths_sect_h.getSubElementText("site-logo"); - if (site_logo==null) - { // no tag - bail out now! + Element site_logo_elt = paths_sect_h.getSubElement("site-logo"); + if (site_logo_elt==null) + { // no tag - bail out now! logger.fatal(" section has no element"); throw new ConfigException("no found in section",paths_sect); } // end if + DOMElementHelper site_logo_h = new DOMElementHelper(site_logo_elt); + site_logo = site_logo_h.getElementText(); + if (site_logo==null) + { // no site logo specified - bail out now! + logger.fatal(" section has no site logo element"); + throw new ConfigException("no site logo found in section",paths_sect); + + } // end if + + // get logo width and height + Integer fooint = site_logo_h.getAttributeInt("width"); + if (fooint!=null) + site_logo_width = fooint.intValue(); + fooint = site_logo_h.getAttributeInt("height"); + if (fooint!=null) + site_logo_height = fooint.intValue(); + + // get logo link URL + String tmp = site_logo_elt.getAttribute("href"); + if (!(StringUtil.isStringEmpty(tmp))) + site_logo_linkURL = tmp; + if (logger.isDebugEnabled()) - logger.debug("Site logo: " + image_url); + logger.debug("Site logo: " + site_logo); Element msg_sect = root_h.getSubElement("messages"); if (msg_sect==null) @@ -178,7 +250,6 @@ public class RenderConfig // Initialize the stock messages list. stock_messages = new HashMap(); NodeList msg_nodes = msg_sect.getChildNodes(); - int i; for (i=0; i"); buf.append("\"").append(site_title);0) buf.append(" HSPACE=").append(hspace); if (vspace>0) buf.append(" VSPACE=").append(vspace); buf.append('>'); + if (site_logo_linkURL!=null) + buf.append(""); return buf.toString(); } // end getSiteImageTag @@ -383,6 +459,14 @@ public class RenderConfig } // end getStdFontTag + String getStdFontTag(int selector, int size) + { + if ((selector<0) || (selector>=colors_array.length)) + throw new IndexOutOfBoundsException("getStdColor(): invalid color selector value"); + return getStdFontTag(colors_array[selector],size); + + } // end getStdFontTag + String getStdBaseFontTag(int size) { StringBuffer buf = new StringBuffer("" + StringUtil.encodeHTML(primary) + ""); + out.write(getStdFontTag(colors_array[CONTENT_HEADER],5) + "" + StringUtil.encodeHTML(primary) + + ""); if (secondary!=null) - out.write("  " + getStdFontTag("#3333AA",3) + "" + StringUtil.encodeHTML(secondary) - + ""); + out.write("  " + getStdFontTag(colors_array[CONTENT_HEADER],3) + "" + + StringUtil.encodeHTML(secondary) + ""); out.write("

\n"); } // end writeContentHeader @@ -422,6 +507,20 @@ public class RenderConfig } // end writeStockMessage + String getStdColor(int selector) + { + if ((selector<0) || (selector>=colors_array.length)) + throw new IndexOutOfBoundsException("getStdColor(): invalid color selector value"); + return colors_array[selector]; + + } // end getStdColor + + int scaleFooterLogo(int param) + { + return (param * footer_logo_scale) / 100; + + } // end scaleFooterLogo + public LeftMenu getLeftMenu(String identifier) { return (LeftMenu)(menus.get(identifier)); @@ -475,4 +574,35 @@ public class RenderConfig } // end createRenderData + /*-------------------------------------------------------------------------------- + * Static initializer + *-------------------------------------------------------------------------------- + */ + + static + { // Initialize the mapping of color names from render-config.xml to color selector IDs. + HashMap m = new HashMap(); + m.put("frame-bg",new Integer(FRAME_BACKGROUND)); + m.put("title-bg",new Integer(TITLE_BACKGROUND)); + m.put("title-fg",new Integer(TITLE_FOREGROUND)); + m.put("title-link",new Integer(TITLE_LINK)); + m.put("left-bg",new Integer(LEFT_BACKGROUND)); + m.put("left-fg",new Integer(LEFT_FOREGROUND)); + m.put("content-bg",new Integer(CONTENT_BACKGROUND)); + m.put("content-fg",new Integer(CONTENT_FOREGROUND)); + m.put("content-hdr",new Integer(CONTENT_HEADER)); + m.put("content-disabled",new Integer(CONTENT_DISABLED)); + m.put("content-error",new Integer(CONTENT_ERROR)); + m.put("sidebox-title-bg",new Integer(SIDEBOX_TITLE_BACKGROUND)); + m.put("sidebox-title-fg",new Integer(SIDEBOX_TITLE_FOREGROUND)); + m.put("sidebox-content-bg",new Integer(SIDEBOX_CONTENT_BACKGROUND)); + m.put("sidebox-content-fg",new Integer(SIDEBOX_CONTENT_FOREGROUND)); + m.put("confirm-title-bg",new Integer(CONFIRM_TITLE_BACKGROUND)); + m.put("confirm-title-fg",new Integer(CONFIRM_TITLE_FOREGROUND)); + m.put("error-title-bg",new Integer(ERROR_TITLE_BACKGROUND)); + m.put("error-title-fg",new Integer(ERROR_TITLE_FOREGROUND)); + colornames_map = Collections.unmodifiableMap(m); + + } // end static initializer + } // end class RenderConfig diff --git a/src/com/silverwrist/venice/servlets/format/RenderData.java b/src/com/silverwrist/venice/servlets/format/RenderData.java index 8064d50..28cb978 100644 --- a/src/com/silverwrist/venice/servlets/format/RenderData.java +++ b/src/com/silverwrist/venice/servlets/format/RenderData.java @@ -211,6 +211,12 @@ public class RenderData } // end getStdFontTag + public String getStdFontTag(int selector, int size) + { + return rconf.getStdFontTag(selector,size); + + } // end getStdFontTag + public String getStdBaseFontTag(int size) { return rconf.getStdBaseFontTag(size); @@ -280,6 +286,18 @@ public class RenderData } // end writeStockMessage + public String getStdColor(int selector) + { + return rconf.getStdColor(selector); + + } // end getStdColor + + public int scaleFooterLogo(int param) + { + return rconf.scaleFooterLogo(param); + + } // end scaleFooterLogo + public LeftMenu getLeftMenu(String identifier) { return rconf.getLeftMenu(identifier); diff --git a/src/com/silverwrist/venice/servlets/format/SideBoxConferences.java b/src/com/silverwrist/venice/servlets/format/SideBoxConferences.java index 1083baf..b3f025b 100644 --- a/src/com/silverwrist/venice/servlets/format/SideBoxConferences.java +++ b/src/com/silverwrist/venice/servlets/format/SideBoxConferences.java @@ -22,7 +22,7 @@ import java.util.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; -public class SideBoxConferences implements ContentRender +public class SideBoxConferences implements ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Attributes @@ -65,7 +65,6 @@ public class SideBoxConferences implements ContentRender public void renderHere(Writer out, RenderData rdat) throws IOException { - out.write(rdat.getStdFontTag(null,2) + "\n"); if (hotlist.size()>0) { // display the list of conferences out.write("\n"); @@ -78,7 +77,7 @@ public class SideBoxConferences implements ContentRender out.write("\n\n"); - out.write("
\"*\"\n" + rdat.getStdFontTag(null,2) + "\n" + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2) + "" + StringUtil.encodeHTML(conf.getName()) + " (" + StringUtil.encodeHTML(conf.getEnclosingSIG().getName()) + ")\n"); if (conf.anyUnread()) @@ -93,11 +92,12 @@ public class SideBoxConferences implements ContentRender } // end if else - out.write(rdat.getStdFontTag(null,2) + "You have no conferences in your hotlist.\n"); + out.write(rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2) + + "You have no conferences in your hotlist.\n"); if (uc.isLoggedIn()) { // write the link at the end - out.write("

" + rdat.getStdFontTag(null,1) + "[ " + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,1) + "[ Manage ]"); } // end if diff --git a/src/com/silverwrist/venice/servlets/format/SideBoxSIGs.java b/src/com/silverwrist/venice/servlets/format/SideBoxSIGs.java index cdc6ae5..827f138 100644 --- a/src/com/silverwrist/venice/servlets/format/SideBoxSIGs.java +++ b/src/com/silverwrist/venice/servlets/format/SideBoxSIGs.java @@ -22,7 +22,7 @@ import java.util.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; -public class SideBoxSIGs implements ContentRender +public class SideBoxSIGs implements ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Attributes @@ -65,7 +65,6 @@ public class SideBoxSIGs implements ContentRender public void renderHere(Writer out, RenderData rdat) throws IOException { - out.write(rdat.getStdFontTag(null,2) + "\n"); if (sig_list.size()>0) { // display the list of available SIGs out.write("\n"); @@ -76,7 +75,7 @@ public class SideBoxSIGs implements ContentRender out.write("\n\n"); - out.write("
\"*\"\n" + rdat.getStdFontTag(null,2) + "\n" + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2) + "" + StringUtil.encodeHTML(sig.getName()) + "\n"); if (sig.isAdmin()) @@ -90,13 +89,15 @@ public class SideBoxSIGs implements ContentRender } // end if else - out.write(rdat.getStdFontTag(null,2) + "You are not a member of any SIGs.\n"); + out.write(rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2) + + "You are not a member of any SIGs.\n"); if (uc.isLoggedIn()) { // write the two links at the end - out.write("

" + rdat.getStdFontTag(null,1) + "[ " + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,1) + "[ Manage | Create New ]"); + } // end if } // end renderHere diff --git a/src/com/silverwrist/venice/servlets/format/TextMessageDialog.java b/src/com/silverwrist/venice/servlets/format/TextMessageDialog.java index 82118fd..9ee85f1 100644 --- a/src/com/silverwrist/venice/servlets/format/TextMessageDialog.java +++ b/src/com/silverwrist/venice/servlets/format/TextMessageDialog.java @@ -24,7 +24,7 @@ import com.silverwrist.util.StringUtil; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.core.*; -public class TextMessageDialog implements ContentRender +public class TextMessageDialog implements ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Static data members @@ -128,7 +128,7 @@ public class TextMessageDialog implements ContentRender public void renderHere(Writer out, RenderData rdat) throws IOException { rdat.writeContentHeader(out,title,null); - out.write(rdat.getStdFontTag(null,2)); + out.write(rdat.getStdFontTag(CONTENT_FOREGROUND,2)); out.write("\n"); out.write(text); out.write("

\n

\n"); diff --git a/src/com/silverwrist/venice/servlets/format/TopDisplay.java b/src/com/silverwrist/venice/servlets/format/TopDisplay.java index aa1b72a..8d6e5ad 100644 --- a/src/com/silverwrist/venice/servlets/format/TopDisplay.java +++ b/src/com/silverwrist/venice/servlets/format/TopDisplay.java @@ -25,7 +25,7 @@ import javax.servlet.http.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; -public class TopDisplay implements ContentRender +public class TopDisplay implements ContentRender, ColorSelectors { /*-------------------------------------------------------------------------------- * Static data values @@ -188,10 +188,12 @@ public class TopDisplay implements ContentRender for (int i=0; i" - + "
\n"); - out.write(rdat.getStdFontTag("white",3) + "" + StringUtil.encodeHTML(sideboxes[i].getPageTitle(rdat)) - + "\n"); - out.write("
\n"); + + "
\n"); + out.write(rdat.getStdFontTag(SIDEBOX_TITLE_FOREGROUND,3) + "" + + StringUtil.encodeHTML(sideboxes[i].getPageTitle(rdat)) + "\n"); + out.write("
\n"); // Fill in the sidebox by calling down to the base. if (sideboxes[i] instanceof ContentRender) @@ -214,7 +216,7 @@ public class TopDisplay implements ContentRender } // end try catch (ServletException se) { // since we can't throw ServletException, we throw IOException - out.write(rdat.getStdFontTag(null,2) + "failure rendering class " + out.write(rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2) + "failure rendering class " + sideboxes[i].getClass().getName() + ": " + StringUtil.encodeHTML(se.getMessage()) + "\n"); out.flush(); @@ -225,7 +227,7 @@ public class TopDisplay implements ContentRender } // end else if else // this is bogus - just display a little error here - out.write(rdat.getStdFontTag(null,2) + "cannot display sidebox of class: " + out.write(rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2) + "cannot display sidebox of class: " + sideboxes[i].getClass().getName() + "\n"); // close up the framework of this sidebox diff --git a/web/format/admin_find.jsp b/web/format/admin_find.jsp index a4e16b5..30f1082 100644 --- a/web/format/admin_find.jsp +++ b/web/format/admin_find.jsp @@ -24,7 +24,7 @@ AdminFindUser data = AdminFindUser.retrieve(request); Variables.failIfNull(data); RenderData rdat = RenderConfig.createRenderData(application,request,response); - String stdfont = rdat.getStdFontTag(null,2); + String stdfont = rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2); %> <% rdat.writeContentHeader(out,"User Account Management",null); %> <%= stdfont %>">Return to @@ -35,7 +35,7 @@ System Administration Menu

"> - <%= rdat.getStdFontTag(null,4) %>Find Users:
+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,4) %>Find Users:
<%= stdfont %> Display all users whose   -
<%= rdat.getStdFontTag(null,3) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,3) %> <%-- The initial search results --%> Search Results <% if (data.getFindCount()>0) { %> diff --git a/web/format/attach_form.jsp b/web/format/attach_form.jsp index d7b4f83..fd578ec 100644 --- a/web/format/attach_form.jsp +++ b/web/format/attach_form.jsp @@ -26,7 +26,7 @@ RenderData rdat = RenderConfig.createRenderData(application,request,response); %> <% rdat.writeContentHeader(out,"Upload Your Attachment",null); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Your attachment may be no more than 1 megabyte in size.

"> diff --git a/web/format/base.jsp b/web/format/base.jsp index 68e7dcc..574d1f1 100644 --- a/web/format/base.jsp +++ b/web/format/base.jsp @@ -25,9 +25,11 @@ Variables.failIfNull(basedat); UserContext user = Variables.getUserContext(application,request,session); RenderData rdat = RenderConfig.createRenderData(application,request,response); - String header_font = rdat.getStdFontTag("white",3); - String stdfont = rdat.getStdFontTag(null,2); - String smallfont = rdat.getStdFontTag(null,1); + String header_font = rdat.getStdFontTag(ColorSelectors.TITLE_FOREGROUND,3); + String header_link_hilite = ""; + String stdfont = rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2); + String leftfont = rdat.getStdFontTag(ColorSelectors.LEFT_FOREGROUND,2); + String smallfont = rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,1); String partial_tgt, foo; %> @@ -40,23 +42,24 @@ <% } // end if %> - + <% if (rdat.useHTMLComments()) { %><% } %> - +
- - - @@ -71,9 +74,9 @@ partial_tgt = "account?tgt=" + URLEncoder.encode(basedat.getLocation()) + "&cmd="; foo = rdat.getEncodedServletPath(partial_tgt + "L"); %> -  - Log Out +  - <%= header_link_hilite %>Log Out <% foo = rdat.getEncodedServletPath(partial_tgt + "P"); %> -  | Profile +  | <%= header_link_hilite %>Profile <% } // end if %> <% } else { %> You are not logged in @@ -82,9 +85,9 @@ partial_tgt = "account?tgt=" + URLEncoder.encode(basedat.getLocation()) + "&cmd="; foo = rdat.getEncodedServletPath(partial_tgt + "L"); %> -  - Log In +  - <%= header_link_hilite %>Log In <% foo = rdat.getEncodedServletPath(partial_tgt + "C"); %> -  | Create Account +  | <%= header_link_hilite %>Create Account <% } // end if %> <% } // end if %> @@ -94,16 +97,16 @@
+ <% if (rdat.useHTMLComments()) { %><% } %> <%= rdat.getSiteImageTag(2,2) %> <%= header_font %> + <%= header_font %> <% if (rdat.useHTMLComments()) { %><% } %> - ">Front Page

- Help |  - ">Find + "><%= header_link_hilite %>Front Page

+ <%= header_link_hilite %>Help |  + "><%= header_link_hilite %>Find

+ <% if (rdat.useHTMLComments()) { %><% } %> <% basedat.renderBannerAd(out,rdat); %>
- - -
- + - - - + diff --git a/web/format/conf_activity.jsp b/web/format/conf_activity.jsp index a1bcba8..b145231 100644 --- a/web/format/conf_activity.jsp +++ b/web/format/conf_activity.jsp @@ -34,7 +34,7 @@ rdat.writeContentHeader(out,(data.isPosterReport() ? "Posters in Conference:" : "Readers in Conference:"),data.getConfName()); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> ">Return to Conference Reports Menu

@@ -42,27 +42,27 @@ <% if (data.anyElements()) { %>

+ <% if (rdat.useHTMLComments()) { %><% } %> - - @@ -113,7 +116,7 @@
<%= stdfont %> +
<%= leftfont %> <% if (rdat.useHTMLComments()) { %><% } %> <% basedat.renderMenu(session,out,rdat); %>
 
<%= stdfont %> +
<%= leftfont %> <% if (rdat.useHTMLComments()) { %><% } %> <% basedat.renderFixedMenu(out,rdat); %>
+ <% if (rdat.useHTMLComments()) { %><% } %> <% basedat.renderContent(application,out,rdat); %> <% if (rdat.useHTMLComments()) { %><% } %> @@ -121,8 +124,8 @@
  +   <% if (rdat.useHTMLComments()) { %><% } %>
@@ -130,7 +133,8 @@
" ALT="Powered by Venice" - WIDTH=129 HEIGHT=103 BORDER=0 HSPACE=0 VSPACE=0> + WIDTH=<%= rdat.scaleFooterLogo(129) %> HEIGHT=<%= rdat.scaleFooterLogo(103) %> BORDER=0 + HSPACE=0 VSPACE=0>
- + <% if (data.isPosterReport()) { %> - - + + <% } else { %> - - + + <% } // end if %> <% Iterator it = data.getRecordsIterator(); %> <% while (it.hasNext()) { %> <% ActiveUser usr = (ActiveUser)(it.next()); %> - <% if (data.isPosterReport()) { %> - - <% } else { %> - -
<%= rdat.getStdFontTag(null,2) %>User Name<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>User Name<%= rdat.getStdFontTag(null,2) %>Last Posted<%= rdat.getStdFontTag(null,2) %>Last Read<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Last Posted<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Last Read<%= rdat.getStdFontTag(null,2) %>Last Read<%= rdat.getStdFontTag(null,2) %>Last Posted<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Last Read<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Last Posted
<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> " TARGET="_blank"><%= usr.getName() %> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%= StringUtil.encodeHTML(rdat.formatDateForDisplay(usr.getLastWrite())) %> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% if (usr.getLastRead()==null) { %> Never <% } else { %> @@ -70,10 +70,10 @@ <% } // end if %> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%= StringUtil.encodeHTML(rdat.formatDateForDisplay(usr.getLastRead())) %> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% if (usr.getLastWrite()==null) { %> Never <% } else { %> @@ -85,7 +85,7 @@ <% } // end while %>
<% } else { %> - <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% if (data.isTopicReport()) { %> <% if (data.isPosterReport()) { %> No posters to topic "<%= data.getTopicName() %>" found. diff --git a/web/format/conf_member.jsp b/web/format/conf_member.jsp index b3b717e..49acfad 100644 --- a/web/format/conf_member.jsp +++ b/web/format/conf_member.jsp @@ -26,18 +26,19 @@ RenderData rdat = RenderConfig.createRenderData(application,request,response); %> <% rdat.writeContentHeader(out,"Set Conference Membership:",data.getConfName()); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> ">Return to Manage Conference Menu

-<%= rdat.getStdFontTag(null,3) %>Find users in SIG "<%= data.getSIGName() %>":

+<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,3) %>Find users in SIG +"<%= data.getSIGName() %>":

"> - <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Display all SIG members whose   - - - diff --git a/web/format/conf_sequence.jsp b/web/format/conf_sequence.jsp index bf3aaf3..14c76e3 100644 --- a/web/format/conf_sequence.jsp +++ b/web/format/conf_sequence.jsp @@ -27,7 +27,7 @@ %> <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Manage Conference List",null); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Return to Conference List

<% if (data.getNumConferences()>0) { %> @@ -80,7 +80,7 @@ SRC="<%= rdat.getFullImagePath("icn_x.gif") %>" ALT="Remove" BORDER=0 WIDTH=16 HEIGHT=16> -

@@ -93,7 +93,7 @@ " ALT="Displayed (toggle)" BORDER=0 WIDTH=16 HEIGHT=16> - @@ -103,7 +103,7 @@ " ALT="Hidden (toggle)" BORDER=0 WIDTH=16 HEIGHT=16> - @@ -112,7 +112,7 @@ - @@ -120,7 +120,7 @@ - @@ -128,12 +128,13 @@ -
<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%-- The search results header --%> Search Results: <% if (data.getFindCount()>0) { %> @@ -138,10 +139,10 @@ " ALT="*" WIDTH=14 HEIGHT=14 BORDER=0> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> "><%= uf.getName() %> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% data.outputDropDown(out,uf.getUID(),uf.getLevel()); %>
<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%= StringUtil.encodeHTML(conf.getName()) %>
<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> This indicates that the conference is displayed in the SIG's conference list. Click the symbol to hide it. <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> This indicates that the conference is hidden in the SIG's conference list. Click the symbol to display it. " ALT="Move Down" BORDER=0 WIDTH=16 HEIGHT=16> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Click this symbol to move the specified conference down in the SIG's conference list.
" ALT="Move Up" BORDER=0 WIDTH=16 HEIGHT=16> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Click this symbol to move the specified conference up in the SIG's conference list.
" ALT="Remove" BORDER=0 WIDTH=16 HEIGHT=16> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Click this symbol to delete the specified conference. You will be prompted to confirm this action.
<% } else { %> - <%= rdat.getStdFontTag(null,2) %>There are no conferences in this SIG. + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>There are no conferences in + this SIG. <% } // end if %> diff --git a/web/format/conferences.jsp b/web/format/conferences.jsp index 723c9fe..323ec27 100644 --- a/web/format/conferences.jsp +++ b/web/format/conferences.jsp @@ -34,7 +34,7 @@

" ALT="*" WIDTH=14 HEIGHT=14 BORDER=0> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% String path = "confdisp?sig=" + data.getSIGID() + "&conf=" + data.getConferenceID(i); %> <%= StringUtil.encodeHTML(data.getConferenceName(i)) %> - Latest activity: <%= rdat.getActivityString(data.getLastUpdateDate(i)) %> diff --git a/web/format/find.jsp b/web/format/find.jsp index d03a243..17d0505 100644 --- a/web/format/find.jsp +++ b/web/format/find.jsp @@ -73,8 +73,8 @@ private static String getActivityString(SIGContext sig, RenderData rdat) <% if (data.getDisplayOption()==FindData.FD_SIGS) { %> <% if (rdat.useHTMLComments()) { %><% } %> - <%= rdat.getStdFontTag(null,4) %>Find SIGs:
- <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,4) %>Find SIGs:
+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Display all SIGs whose   		" ALT="*" WIDTH=14 HEIGHT=14 BORDER=0> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% CategoryDescriptor c = (CategoryDescriptor)(it.next()); a_head = ""; @@ -200,7 +200,7 @@ private static String getActivityString(SIGContext sig, RenderData rdat) %>
- -
<%= rdat.getStdFontTag(null,3) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,3) %> <%-- The initial search results --%> <% if (cat!=null) { %>SIGs in Category<% } else { %>Search Results<% } %> <% if (data.getFindCount()>0) { %> @@ -247,7 +247,7 @@ private static String getActivityString(SIGContext sig, RenderData rdat) " ALT="*" WIDTH=14 HEIGHT=14 BORDER=0> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% Object item = results.get(i); %> <% if (data.getDisplayOption()==FindData.FD_SIGS) { %> <% diff --git a/web/format/hotlist.jsp b/web/format/hotlist.jsp index 409685b..78193ee 100644 --- a/web/format/hotlist.jsp +++ b/web/format/hotlist.jsp @@ -24,7 +24,7 @@ Hotlist data = Hotlist.retrieve(request); Variables.failIfNull(data); RenderData rdat = RenderConfig.createRenderData(application,request,response); - String stdfont = rdat.getStdFontTag(null,2); + String stdfont = rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2); %> <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Your Conference Hotlist",null); %> diff --git a/web/format/invitation.jsp b/web/format/invitation.jsp index b59ed05..b6794dd 100644 --- a/web/format/invitation.jsp +++ b/web/format/invitation.jsp @@ -32,15 +32,16 @@ - + - - - + + + + + + - +
<%= rdat.getStdFontTag(null,2) %>Send to: <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Send to: 
- <%= rdat.getStdFontTag(null,2) %>Personal message to be added to invitation:
- -
<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Personal message + to be added to invitation:
" NAME="send" ALT="Send E-Mail" WIDTH=80 HEIGHT=24 BORDER=0>  diff --git a/web/format/manage_aliases.jsp b/web/format/manage_aliases.jsp index 9a19efb..afa784d 100644 --- a/web/format/manage_aliases.jsp +++ b/web/format/manage_aliases.jsp @@ -28,12 +28,12 @@ %> <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Managing Conference Aliases:",data.getConfName()); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> ">Return to Manage Conference Menu

<% if (data.getErrorMessage()!=null) { %> - <%= rdat.getStdFontTag("red",2) %><%= StringUtil.encodeHTML(data.getErrorMessage()) %>

+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_ERROR,2) %><%= StringUtil.encodeHTML(data.getErrorMessage()) %>

<% } // end if %> Current Aliases:

@@ -44,7 +44,7 @@

" ALT="*" WIDTH=14 HEIGHT=14 BORDER=0><%= rdat.getStdFontTag(null,2) %><%= StringUtil.encodeHTML(name) %><%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %><%= StringUtil.encodeHTML(name) %>      <% if (data.canRemoveAliases()) { %> diff --git a/web/format/manage_conf.jsp b/web/format/manage_conf.jsp index 2fa089a..795b6f8 100644 --- a/web/format/manage_conf.jsp +++ b/web/format/manage_conf.jsp @@ -28,7 +28,7 @@ <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Manage Conference:",data.getConfName()); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> ">Return to Topic List

@@ -37,7 +37,7 @@ - <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Set default pseud for conference:   " NAME="set" ALT="Set" @@ -46,7 +46,7 @@

<% if (rdat.useHTMLComments()) { %><% } %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> ">Mark entire conference as read (fixseen)

@@ -54,7 +54,7 @@ <% if (data.displayAdminSection()) { %> <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Host Tools",null); %> - <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> ">Change Conference Information

">Manage diff --git a/web/format/newsigwelcome.jsp b/web/format/newsigwelcome.jsp index 3e0acc7..852118a 100644 --- a/web/format/newsigwelcome.jsp +++ b/web/format/newsigwelcome.jsp @@ -27,7 +27,7 @@ %> <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Welcome!",null); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Your new SIG "<%= StringUtil.encodeHTML(data.getSIGName()) %>" has been created, and you are its host. You may now wish to send out invitations to other people to join your new SIG. You will also want to enter your SIG's administration page and set its category and/or additional diff --git a/web/format/newtopic.jsp b/web/format/newtopic.jsp index 9c4d236..2027bd8 100644 --- a/web/format/newtopic.jsp +++ b/web/format/newtopic.jsp @@ -29,7 +29,7 @@ <% rdat.writeContentHeader(out,data.isPreview() ? "Preview New Topic" : "Create New Topic", "in: " + data.getConfName()); %> <% if (data.isPreview()) { %> - <%= rdat.getStdFontTag(null,3) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,3) %> <% if (data.getNumSpellingErrors()==0) { %> Your post did not contain any spelling errors. <% } else if (data.getNumSpellingErrors()==1) { %> @@ -47,18 +47,18 @@ - - + diff --git a/web/format/posts.jsp b/web/format/posts.jsp index 55768b0..5067b49 100644 --- a/web/format/posts.jsp +++ b/web/format/posts.jsp @@ -26,8 +26,8 @@ RenderData rdat = RenderConfig.createRenderData(application,request,response); %> <% if (rdat.useHTMLComments()) { %><% } %> -<%= rdat.getStdFontTag("#3333AA",5) %><%= data.getTopicName() %>   -<%= rdat.getStdFontTag("#3333AA",3) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_HEADER,5) %><%= data.getTopicName() %>   +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_HEADER,3) %> <% if (data.isTopicArchived()) { %>(Archived)<% } else if (data.isTopicFrozen()) { %>(Frozen)<% } %> <%= data.getTotalMessages() %> Total; <%= data.getNewMessages() %> New; Last: <%= rdat.formatDateForDisplay(data.getLastUpdate()) %> @@ -112,7 +112,7 @@ ALIGN=BOTTOM WIDTH=80 HEIGHT=24 BORDER=0> -
- <%= rdat.getStdFontTag(null,2) %>New topic name:
+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>New topic name:
- <%= rdat.getStdFontTag(null,2) %>Your name/header:
+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Your name/header:
- <%= rdat.getStdFontTag(null,2) %>CHECKED<% } %> > Attach a file
<%= rdat.getStdFontTag(null,2) %>Message:<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Message:<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> " TARGET="_blank">HTML Guide
<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% if (rdat.useHTMLComments()) { %><% } %> [  ">View All @@ -155,11 +155,11 @@
<% } // end if %> - <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> "><%= msg.getPostNumber() %> of <%= data.getTotalMessages() - 1 %> - <%= rdat.getStdFontTag(null,1) %><<%= data.getMessageReference(msg) %>> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,1) %><<%= data.getMessageReference(msg) %>> <% if (data.showAdvanced() && msg.isHidden()) { %> (Hidden) <% } // end if %> @@ -177,21 +177,22 @@ ALT="(Attachment <%= msg.getAttachmentFilename() %> - <%= msg.getAttachmentLength() %> bytes)" WIDTH=16 HEIGHT=16 BORDER=0> <% } // end if %> -

- <% if (msg.isScribbled()) { %> - - (Scribbled by <%= data.getMessageBodyText(msg) %> on - <%= rdat.formatDateForDisplay(msg.getScribbleDate()) %>) -

- <% } else if (msg.isHidden() && !(data.showAdvanced())) { %> - - ">(Hidden - Message: <%= msg.getNumLines() %> <% if (msg.getNumLines()==1) { %>Line<% } else { %>Lines<% } %>) -

- <% } else { %> - 

<%= rdat.rewritePostData(data.getMessageBodyText(msg)) %>
- <% } // end if %> +

+ <% if (msg.isScribbled()) { %> + + (Scribbled by <%= data.getMessageBodyText(msg) %> on + <%= rdat.formatDateForDisplay(msg.getScribbleDate()) %>) +

+ <% } else if (msg.isHidden() && !(data.showAdvanced())) { %> + + ">(Hidden + Message: <%= msg.getNumLines() %> <% if (msg.getNumLines()==1) { %>Line<% } else { %>Lines<% } %>) +

+ <% } else { %> + 

<%= rdat.rewritePostData(data.getMessageBodyText(msg)) %>
+ <% } // end if %> + <% if (data.showAdvanced()) { %> <% String po_loc = data.getLocator() + "&msg=" + msg.getPostNumber(); %> 		@@ -230,7 +231,7 @@ -
 <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% if (rdat.useHTMLComments()) { %><% } %> [  ">View All @@ -290,7 +291,8 @@
<% if (data.displayPostBox()) { %> -
<%= rdat.getStdFontTag(null,3) %>Post Message in "<%= data.getTopicName() %>": +
<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,3) %>Post Message in + "<%= data.getTopicName() %>":
"> @@ -302,13 +304,13 @@ - - + @@ -333,7 +335,9 @@
- <%= rdat.getStdFontTag(null,2) %>Your name/header:
+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Your name/header:
- <%= rdat.getStdFontTag(null,2) %> Attach a file + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Attach a file
<%= rdat.getStdFontTag(null,2) %>Message:<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Message:<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> " TARGET="_blank">HTML Guide
<% } else if (data.isTopicArchived()) { %> -
<%= rdat.getStdFontTag(null,2) %>This is an Archived Topic
+
<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>This is an + Archived Topic
<% } else if (data.isTopicFrozen()) { %> -
<%= rdat.getStdFontTag(null,2) %>This is a Frozen Topic
+
<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>This is a + Frozen Topic
<% } // end if %> diff --git a/web/format/preview.jsp b/web/format/preview.jsp index ca5599f..bf1bc5e 100644 --- a/web/format/preview.jsp +++ b/web/format/preview.jsp @@ -26,7 +26,7 @@ RenderData rdat = RenderConfig.createRenderData(application,request,response); %> <% rdat.writeContentHeader(out,"Previewing Post",null); %> -<%= rdat.getStdFontTag(null,3) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,3) %> <% if (data.getNumSpellingErrors()==0) { %> Your post did not contain any spelling errors. <% } else if (data.getNumSpellingErrors()==1) { %> @@ -50,14 +50,14 @@ <% } // end if %> - - + diff --git a/web/format/report_conf.jsp b/web/format/report_conf.jsp index 70ddddd..9ea58d9 100644 --- a/web/format/report_conf.jsp +++ b/web/format/report_conf.jsp @@ -24,7 +24,7 @@ ReportConferenceMenu data = ReportConferenceMenu.retrieve(request); Variables.failIfNull(data); RenderData rdat = RenderConfig.createRenderData(application,request,response); - String stdfont = rdat.getStdFontTag(null,2); + String stdfont = rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2); String partial; %> <% if (rdat.useHTMLComments()) { %><% } %> diff --git a/web/format/sig_member.jsp b/web/format/sig_member.jsp index 9f6015b..e2d176d 100644 --- a/web/format/sig_member.jsp +++ b/web/format/sig_member.jsp @@ -26,17 +26,17 @@ RenderData rdat = RenderConfig.createRenderData(application,request,response); %> <% rdat.writeContentHeader(out,"Set SIG Membership:",data.getSIGName()); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Return to SIG Administration Menu

-<%= rdat.getStdFontTag(null,3) %>Find Users:

+<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,3) %>Find Users:

"> - <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Display all users whose  

- <%= rdat.getStdFontTag(null,2) %>Your name/header:
+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Your name/header:
- <%= rdat.getStdFontTag(null,2) %>CHECKED<% } %> > Attach a file
<%= rdat.getStdFontTag(null,2) %>Message:<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Message:<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> " TARGET="_blank">HTML Guide
- - - diff --git a/web/format/sigcatbrowser.jsp b/web/format/sigcatbrowser.jsp index 4a919d5..fca0885 100644 --- a/web/format/sigcatbrowser.jsp +++ b/web/format/sigcatbrowser.jsp @@ -32,7 +32,7 @@ " ALT=\"Cancel\" WIDTH=80 HEIGHT=24 BORDER=0> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Previous SIG Category: <%= StringUtil.encodeHTML(data.getPreviousCategory()) %>

Current category:
<% if (catid>=0) { %><% } %>Top<% if (catid>=0) { %><% } %>: @@ -54,7 +54,7 @@

- - @@ -54,11 +54,12 @@ -
<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%-- The search results header --%> Search Results: <% if (data.getFindCount()>0) { %> @@ -135,10 +135,10 @@ " ALT="*" WIDTH=14 HEIGHT=14 BORDER=0> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> "><%= uf.getName() %> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% data.outputDropDown(out,uf.getUID(),uf.getLevel()); %>
" ALT="*" WIDTH=14 HEIGHT=14 BORDER=0> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%= StringUtil.encodeHTML(c.getTitleAtLevel(c.getNumLevels()-1)) %> <% if (c.isSymbolicLink()) { %>@<% } %>     [set] diff --git a/web/format/siglist.jsp b/web/format/siglist.jsp index 3cd6e4d..86ed159 100644 --- a/web/format/siglist.jsp +++ b/web/format/siglist.jsp @@ -27,7 +27,7 @@ %> <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Your SIGs",null); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> ">Return to Front Page

<% if (data.getNumSIGs()>0) { %> @@ -42,7 +42,7 @@ HEIGHT=16> <% } else { %> <% } %>

<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> "><%= StringUtil.encodeHTML(sig.getName()) %>
ALT="Unjoin" BORDER=0 WIDTH=16 HEIGHT=16> <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Click this symbol to unjoin the specified SIG.
<% } else { %> - <%= rdat.getStdFontTag(null,2) %>You are not a member of any SIGs. + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>You are not a member of + any SIGs. <% } // end if %> diff --git a/web/format/sigprofile.jsp b/web/format/sigprofile.jsp index 84f534f..0778362 100644 --- a/web/format/sigprofile.jsp +++ b/web/format/sigprofile.jsp @@ -32,7 +32,7 @@ <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"SIG Profile:",sig.getName()); %> - -
<%= rdat.getStdFontTag(null,1) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,1) %>

<% Date tmpd = sig.getCreationDate(); %> @@ -64,7 +64,7 @@ 		<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <% if (sig.isPublicSIG()) { %>Public<% } else { %>Private<% } %> Special Interest Group
Category: <% for (int i=0; i diff --git a/web/format/sigwelcome.jsp b/web/format/sigwelcome.jsp index ebb7c84..4c81d03 100644 --- a/web/format/sigwelcome.jsp +++ b/web/format/sigwelcome.jsp @@ -27,7 +27,7 @@ %> <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Welcome!",null); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> Welcome to the "<%= StringUtil.encodeHTML(data.getSIGName()) %>" SIG! As a SIG member, you now have access to the various resources which your SIG's host has elected to provide. Enjoy your membership!

diff --git a/web/format/slippage.jsp b/web/format/slippage.jsp index c39fbd8..a9d41e9 100644 --- a/web/format/slippage.jsp +++ b/web/format/slippage.jsp @@ -27,7 +27,7 @@ %> <% if (rdat.useHTMLComments()) { %><% } %> <% rdat.writeContentHeader(out,"Slippage or Double-Click Detected",null); %> -<%= rdat.getStdFontTag(null,2) %> +<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> The following posts slipped in while you were typing. You may choose to edit your message and re-post, just post it as is, or cancel your posting altogether.

@@ -39,9 +39,9 @@ TopicMessageContext msg = (TopicMessageContext)(it.next()); String poster = data.getPosterName(msg); %> - <%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%= msg.getPostNumber() %> of <%= data.getTotalMessages() - 1 %> - <%= rdat.getStdFontTag(null,1) %><<%= data.getMessageReference(msg) %>>
+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,1) %><<%= data.getMessageReference(msg) %>>
<%= msg.getPseud() %> ( " TARGET="_blank"><%= poster %>, @@ -59,7 +59,8 @@ <% } // end while %> <% if (rdat.useHTMLComments()) { %><% } %> -

<%= rdat.getStdFontTag(null,3) %>Post Message in "<%= data.getTopicName() %>": +
<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,3) %>Post Message in +"<%= data.getTopicName() %>":
"> @@ -72,14 +73,14 @@ - - + diff --git a/web/format/top_content.jsp b/web/format/top_content.jsp index 8f1aef0..4cec90e 100644 --- a/web/format/top_content.jsp +++ b/web/format/top_content.jsp @@ -28,18 +28,18 @@ <% if (rdat.useHTMLComments()) { %><% } %> <% if (data.displayWelcome()) { %> <% rdat.writeContentHeader(out,rdat.getStockMessage("welcome-top"),null); %> - <%= rdat.getStdFontTag(null,2) %><%= rdat.getStockMessage("welcome") %>

+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %><%= rdat.getStockMessage("welcome") %>

<% } // end if %> -<% rdat.writeContentHeader(out,rdat.getStockMessage("currents-top"),null); %> -<% int ntp = data.getNumTopPosts(); %> -<% if (ntp>0) { %> - <% for (int i=0; i - <% if (i>0) { %>

<% } %> - <% +<% + rdat.writeContentHeader(out,rdat.getStockMessage("currents-top"),null); + int ntp = data.getNumTopPosts(); + if (ntp>0) { + for (int i=0; i - <%= rdat.getStdFontTag(null,2) %> +%> + <% if (i>0) { %>
<% } %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%= msg.getPseud() %> ( " TARGET="_blank"><%= poster %>, @@ -48,7 +48,13 @@ 

<%= rdat.rewritePostData(data.getMessageBodyText(msg)) %>
- <% } // end for %> -<% } else { %> - <%= rdat.getStdFontTag(null,2) %>No front page postings found. +<% + } // end for + } else { +%> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>No front page postings found. <% } // end if %> + + + + diff --git a/web/format/topics.jsp b/web/format/topics.jsp index 763dff4..b2ad213 100644 --- a/web/format/topics.jsp +++ b/web/format/topics.jsp @@ -24,7 +24,7 @@ TopicListing data = TopicListing.retrieve(request); Variables.failIfNull(data); RenderData rdat = RenderConfig.createRenderData(application,request,response); - String stdfont = rdat.getStdFontTag(null,2); + String stdfont = rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2); String self = "confdisp?" + data.getLocator(); String tmp; %> diff --git a/web/format/userprofile.jsp b/web/format/userprofile.jsp index d11c55c..db49081 100644 --- a/web/format/userprofile.jsp +++ b/web/format/userprofile.jsp @@ -31,7 +31,7 @@ <% rdat.writeContentHeader(out,"User Profile:",prof.getUserName()); %>
- <%= rdat.getStdFontTag(null,2) %>Your name/header:
+ <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Your name/header:
- <%= rdat.getStdFontTag(null,2) %>CHECKED<% } %> > Attach a file
<%= rdat.getStdFontTag(null,2) %>Message:<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Message:<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> " TARGET="_blank">HTML Guide
- - <% } // end if %> @@ -91,12 +91,13 @@
<%= rdat.getStdFontTag(null,1) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,1) %>

@@ -49,7 +49,7 @@ <% } // end if %> 		<%= rdat.getStdFontTag(null,2) %> + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%= StringUtil.encodeHTML(data.getFullName()) %>
<% tmp = prof.getEmail(); %> @@ -83,7 +83,7 @@ <% tmp = prof.getDescription(); %> <% if (!(StringUtil.isStringEmpty(tmp))) { %> -
<%= rdat.getStdFontTag(null,2) %> +
<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %> <%= StringUtil.encodeHTML(tmp) %>
<% if (prof.canSendQuickEmail()) { %> -
<%= rdat.getStdFontTag(null,2) %>Send Quick E-Mail To <%= prof.getUserName() %>:
+
<%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Send Quick E-Mail To + <%= prof.getUserName() %>:
">
- <%= rdat.getStdFontTag(null,2) %>Subject: + <%= rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2) %>Subject: