[cvs] eforum commit by ppilgrim: This is the last checkin before
catching the
JCorporate Ltd
jcorp at jcorporate.com
Thu Jun 23 04:42:17 UTC 2005
Log Message:
-----------
This is the last checkin before catching the plane to San Francisco. The skin look and feel is finally working satisfactorily. The trick was to make the Skinner a TilesAction instead of a Expresso Controller, because the ControllerResponse object was overwritten. Skinner also behaves very much like the Struts DispatchAction vi WEB-INF/config/eforum-tiles-def.xml It is now possible to switch between the 'classic' and 'galaxywarp' skins at run-time and back again. Cool Stuff. Warning: Consider this an early beta.
Modified Files:
--------------
eforum/src/WEB-INF/config:
eforum-config.xml
eforum/src/WEB-INF/src/com/jcorporate/eforum:
ForumSchema.java
ForumUtils.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/controller:
Browse.java
Personalise.java
Search.java
SendNotice.java
Skinner.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj:
DefaultIndexProgressModel.java
ForumAttachment.java
ForumAttachmentMessage.java
ForumGroup.java
ForumMail.java
ForumMessage.java
ForumMonoTextDef.java
ForumOptions.java
ForumSecurity.java
ForumSignature.java
ForumSkinLAFDef.java
ForumSkinProperties.java
ForumTextDef.java
ForumThread.java
ForumVarTextDef.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/job:
IndexMessages.java
SendNotice.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/search:
SearchIndexer.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/search/lucene:
LuceneSearchIndexer.java
eforum/src/expresso/components/eforum/classic/templates:
standardLayout.jsp
eforum/src/expresso/components/eforum/galaxywarp/styles:
eforum.css
eforum/src/expresso/components/eforum/galaxywarp/templates:
standardLayout.jsp
eforum/src/expresso/components/eforum/javascript:
menu-config.jsp
eforum/src/expresso/components/eforum/jsp:
browseMessages10.jsp
groups.jsp
messages.jsp
preamble10.jsp
threads.jsp
Revision Data
-------------
Index: menu-config.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/javascript/menu-config.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/expresso/components/eforum/javascript/menu-config.jsp -Lsrc/expresso/components/eforum/javascript/menu-config.jsp -u -r1.2 -r1.3
--- src/expresso/components/eforum/javascript/menu-config.jsp
+++ src/expresso/components/eforum/javascript/menu-config.jsp
@@ -1,46 +1,51 @@
-<%@ page language="java" errorPage="/expresso/error.jsp" %>
-<%@ page info="eForum Layout Design: A Tiles template" %>
-<%@ taglib uri="/WEB-INF/tld/expresso.tld" prefix="expresso" %>
-<%@ taglib uri="/WEB-INF/tld/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/tld/struts-logic.tld" prefix="purelogic" %>
-<%@ taglib uri="/WEB-INF/tld/struts-bean.tld" prefix="purebean" %>
-<%@ taglib uri="/WEB-INF/tld/struts-html.tld" prefix="purehtml" %>
-<%@ taglib uri="/WEB-INF/tld/c.tld" prefix="c" %>
-<%@ taglib uri="/WEB-INF/tld/fmt.tld" prefix="fmt" %>
-
-<%-- THIS IS ACTUALLY A JAVASCRIPT FILE!!!!--%>
-
-//
-// This function creates the DHTML Menu system.
-//
-// ======================================================================
-// Jim's DHTML Menu v5.3- © Jim Salyer (jsalyer at REMOVETHISmchsi.com)
-// Visit Dynamic Drive: http://www.dynamicdrive.com for script and instructions
-// This notice must stay intact for use.
-//
-// See the licence and term of use file for more information
-// ======================================================================
-//
-
-menus = new Array();
-
-<c:url var="triangleGifUrl" value="/expresso/components/eforum/javascript/jimmenu-v5.3/tri.gif" />
-<c:url var="triangleDownGifUrl" value="/expresso/components/eforum/javascript/jimmenu-v5.3/tridown.gif" />
+<%@ page language="java" errorPage="/expresso/error.jsp" %>
+<%@ page info="eForum Layout Design: A Tiles template" %>
+<%@ taglib uri="/WEB-INF/tld/expresso.tld" prefix="expresso" %>
+<%@ taglib uri="/WEB-INF/tld/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tld/expresso-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tld/expresso-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tld/expresso-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tld/struts-logic.tld" prefix="purelogic" %>
+<%@ taglib uri="/WEB-INF/tld/struts-bean.tld" prefix="purebean" %>
+<%@ taglib uri="/WEB-INF/tld/struts-html.tld" prefix="purehtml" %>
+<%@ taglib uri="/WEB-INF/tld/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/tld/fmt.tld" prefix="fmt" %>
+
+<%-- THIS IS ACTUALLY A JAVASCRIPT FILE!!!!--%>
+
+// Set Forum Schema once i18n: <bean:message key="application.name" schema="com.jcorporate.eforum.ForumSchema" />
+
+//
+// This function creates the DHTML Menu system.
+//
+// ======================================================================
+// Jim's DHTML Menu v5.3- © Jim Salyer (jsalyer at REMOVETHISmchsi.com)
+// Visit Dynamic Drive: http://www.dynamicdrive.com for script and instructions
+// This notice must stay intact for use.
+//
+// See the licence and term of use file for more information
+// ======================================================================
+//
+
+menus = new Array();
+
+<c:url var="triangleGifUrl" value="/expresso/components/eforum/javascript/jimmenu-v5.3/tri.gif" />
+<c:url var="triangleDownGifUrl" value="/expresso/components/eforum/javascript/jimmenu-v5.3/tridown.gif" />
forumActions = '<bean:message key="ForumActions" schema="com.jcorporate.eforum.ForumSchema"/>'
-
-function createTopNavigationMenu()
-{
- //Main Menu items:
- menus[0] = new menu(22, "horizontal", 5, 64, -2, -2, "#CACAFF", "#0000A0", "Verdana,Helvetica", 9,
- "bold", "bold", "black", "white", 1, "gray", 2, "rollover:<c:out value='${triangleDownGifUrl}' />:<c:out value='${triangleDownGifUrl}' />", false, true, true, true, 12, true, 4, 4, "black");
- menus[0].addItem("http://www.dynamicdrive.com", "", 100, "center", "Home", 0);
- menus[0].addItem("#", "", 120, "center", "Web Building", 1);
- menus[0].addItem("#", "", 100, "center", "News", 2);
- menus[0].addItem("#", "", 110, "center", "Search", 4);
-
-//Sub Menu for 2nd Main Menu Item ("web building"):
- menus[1] = new menu(150, "vertical", 0, 0, -5, -5, "#CACAFF", "#0000A0", "Verdana,Helvetica", 9, "bold",
+
+function createTopNavigationMenu()
+{
+ //Main Menu items:
+ menus[0] = new menu(22, "horizontal", 5, 64, -2, -2, "#CACAFF", "#0000A0", "Verdana,Helvetica", 9,
+ "bold", "bold", "black", "white", 1, "gray", 2, "rollover:<c:out value='${triangleDownGifUrl}' />:<c:out value='${triangleDownGifUrl}' />", false, true, true, true, 12, true, 4, 4, "black");
+ menus[0].addItem("http://www.dynamicdrive.com", "", 100, "center", "Home", 0);
+ menus[0].addItem("#", "", 120, "center", "Web Building", 1);
+ menus[0].addItem("#", "", 100, "center", "News", 2);
+ menus[0].addItem("#", "", 110, "center", "Search", 4);
+
+//Sub Menu for 2nd Main Menu Item ("web building"):
+ menus[1] = new menu(250, "vertical", 0, 0, -5, -5, "#CACAFF", "#0000A0", "Verdana,Helvetica", 9, "bold",
"bold", "black", "white", 1, "gray", 2, 62, false, true, false, true, 6, true, 4, 4, "black");
menus[1].addItem('<c:url value="/eforum/Browse.do" />', "", 22, "left", "Browse Forums", 0);
menus[1].addItem('<c:url value="/eforum/Personalise.do?state=promptEditOptionsForm" />', "", 22, "left", "Personalisation", 0);
@@ -50,29 +55,29 @@
menus[1].addItem('<c:url value="/eforum/Search.do?state=cancelIndexing" />', "", 22, "left", '<bean:message key="CancelIndexForumMessages"/>', 0);
menus[1].addItem('<c:url value="/eforum/Search.do?state=resetIndexing" />', "", 22, "left", '<bean:message key="ResetIndexStatus"/>', 0);
// TODO: Taglib EndIf
- menus[1].addItem("http://www.dynamicdrive.com", "", 22, "left", "Dynamic Drive", 0);
- menus[1].addItem("http://www.javascriptkit.com", "", 22, "left", "JavaScript Kit", 0);
- menus[1].addItem("http://www.codingforums.com", "", 22, "left", "Coding Forums", 0);
- menus[1].addItem("http://www.builder.com", "NEWWIN", 22, "left", "Builder.com", 0);
-
-//Sub Menu for 3rd Main Menu Item ("News"):
- menus[2] = new menu(130, "vertical", 0, 0, 0, 0, "#CACAFF", "#0000A0", "Verdana,Helvetica", 9, "bold",
- "bold", "black", "white", 1, "gray", 2, "rollover:<c:out value='${triangleGifUrl}' />:<c:out value='${triangleGifUrl}' />", false, true, false, false, 0, true, 4, 4, "black");
- menus[2].addItem("http://www.cnn.com", "", 22, "left", "CNN", 0);
- menus[2].addItem("http://www.msnbc.com", "", 22, "left", "MSNBC", 0);
- menus[2].addItem("http://news.bbc.co.uk", "", 22, "left", "BBC News", 0);
- menus[2].addItem("http://www.cbsnews.com", "", 22, "left", "Sports News", 3);
-
-//Sub Menu for Sub Menu "Sports News":
- menus[3] = new menu(135, "vertical", 0, 0, 0, 0, "#E1E1E1", "black", "Verdana,Helvetica", 9, "bold", "bold", "black", "white", 1, "gray", 2, 62, false, true, false, false, 0, true, 4, 4, "black");
- menus[3].addItem("http://www.espn.com", "", 22, "left", "ESPN Sports", 0);
- menus[3].addItem("http://www.nba.com", "", 22, "left", "NBA", 0);
-
-//Sub Menu for 4th Main Menu Item ("Search"):
- menus[4] = new menu(130, "vertical", 0, 0, 0, 0, "#CACAFF", "#0000A0", "Verdana,Helvetica", 9, "bold", "bold", "black", "white", 1, "gray", 2, ">>", false, true, false, false, 0, true, 4, 4, "black");
- menus[4].addItem("http://www.google.com", "", 22, "left", "Google", 0);
- menus[4].addItem("http://www.yahoo.com", "", 22, "left", "Yahoo", 0);
- menus[4].addItem("http://www.altavista.com", "", 22, "left", "AlltheWeb", 0);
- menus[4].addItem("javascript:alert('hi')", "", 22, "left", "Teoma", 0);
-
+ menus[1].addItem("http://www.dynamicdrive.com", "", 22, "left", "Dynamic Drive", 0);
+ menus[1].addItem("http://www.javascriptkit.com", "", 22, "left", "JavaScript Kit", 0);
+ menus[1].addItem("http://www.codingforums.com", "", 22, "left", "Coding Forums", 0);
+ menus[1].addItem("http://www.builder.com", "NEWWIN", 22, "left", "Builder.com", 0);
+
+//Sub Menu for 3rd Main Menu Item ("News"):
+ menus[2] = new menu(130, "vertical", 0, 0, 0, 0, "#CACAFF", "#0000A0", "Verdana,Helvetica", 9, "bold",
+ "bold", "black", "white", 1, "gray", 2, "rollover:<c:out value='${triangleGifUrl}' />:<c:out value='${triangleGifUrl}' />", false, true, false, false, 0, true, 4, 4, "black");
+ menus[2].addItem("http://www.cnn.com", "", 22, "left", "CNN", 0);
+ menus[2].addItem("http://www.msnbc.com", "", 22, "left", "MSNBC", 0);
+ menus[2].addItem("http://news.bbc.co.uk", "", 22, "left", "BBC News", 0);
+ menus[2].addItem("http://www.cbsnews.com", "", 22, "left", "Sports News", 3);
+
+//Sub Menu for Sub Menu "Sports News":
+ menus[3] = new menu(135, "vertical", 0, 0, 0, 0, "#E1E1E1", "black", "Verdana,Helvetica", 9, "bold", "bold", "black", "white", 1, "gray", 2, 62, false, true, false, false, 0, true, 4, 4, "black");
+ menus[3].addItem("http://www.espn.com", "", 22, "left", "ESPN Sports", 0);
+ menus[3].addItem("http://www.nba.com", "", 22, "left", "NBA", 0);
+
+//Sub Menu for 4th Main Menu Item ("Search"):
+ menus[4] = new menu(130, "vertical", 0, 0, 0, 0, "#CACAFF", "#0000A0", "Verdana,Helvetica", 9, "bold", "bold", "black", "white", 1, "gray", 2, ">>", false, true, false, false, 0, true, 4, 4, "black");
+ menus[4].addItem("http://www.google.com", "", 22, "left", "Google", 0);
+ menus[4].addItem("http://www.yahoo.com", "", 22, "left", "Yahoo", 0);
+ menus[4].addItem("http://www.altavista.com", "", 22, "left", "AlltheWeb", 0);
+ menus[4].addItem("javascript:alert('hi')", "", 22, "left", "Teoma", 0);
+
} //OUTER CLOSING BRACKET. EVERYTHING ADDED MUST BE ABOVE THIS LINE.
Index: eforum-config.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/config/eforum-config.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/WEB-INF/config/eforum-config.xml -Lsrc/WEB-INF/config/eforum-config.xml -u -r1.13 -r1.14
--- src/WEB-INF/config/eforum-config.xml
+++ src/WEB-INF/config/eforum-config.xml
@@ -16,7 +16,8 @@
<!-- Work started with Struts Tiles Template Wed Mar 31 -->
<!-- *PP* 19:51:43 BST 2004 -->
<action path="/eforum/Browse" type="com.jcorporate.eforum.controller.Browse" name="browseForm" scope="session" validate="false">
- <forward name="selGroup" path="/expresso/components/eforum/jsp/groups.jsp"/>
+ <forward name="selGroup" path=".eforum.selectGroup"/>
+ <forward name="selGroup_BAK" path="/expresso/components/eforum/jsp/groups.jsp"/>
<forward name="promptGroupSubscribe" path="/expresso/components/eforum/jsp/subscribe.jsp"/>
<forward name="browseThreads" path=".eforum.browseThreads"/>
<forward name="browseMessages" path=".eforum.viewMessages"/>
Index: ForumSchema.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java -u -r1.22 -r1.23
--- src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java
+++ src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java
@@ -44,7 +44,7 @@
addController(com.jcorporate.eforum.controller.Browse.class);
addController(com.jcorporate.eforum.controller.SendNotice.class);
addController(com.jcorporate.eforum.controller.Search.class);
- addController(com.jcorporate.eforum.controller.Skinner.class);
+ // addController(com.jcorporate.eforum.controller.Skinner.class);
addJob(com.jcorporate.eforum.job.SendNotice.class);
addJob(com.jcorporate.eforum.job.IndexMessages.class);
Index: ForumUtils.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/ForumUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumUtils.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumUtils.java -u -r1.5 -r1.6
--- src/WEB-INF/src/com/jcorporate/eforum/ForumUtils.java
+++ src/WEB-INF/src/com/jcorporate/eforum/ForumUtils.java
@@ -15,12 +15,15 @@
import com.jcorporate.eforum.dbobj.ForumOptions;
import com.jcorporate.eforum.dbobj.ForumSignature;
+import com.jcorporate.eforum.dbobj.ForumSkinLAFDef;
+import com.jcorporate.eforum.dbobj.ForumSkinProperties;
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.controller.ExpressoRequest;
import com.jcorporate.expresso.core.controller.ExpressoResponse;
import com.jcorporate.expresso.core.controller.ServletControllerRequest;
import com.jcorporate.expresso.core.db.DBException;
+import com.jcorporate.expresso.core.misc.StringUtil;
/**
@@ -151,6 +154,34 @@
bean.setInt("wordWrapLength", fo.getFieldInt( ForumOptions.FLD_WORD_WRAP_LENGTH ) );
bean.set("headerTextFontCss", fo.getField( ForumOptions.VFLD_HEADER_TEXT_FONT_CSSNAME ) );
bean.set("bannerTextFontCss", fo.getField( ForumOptions.VFLD_BANNER_TEXT_FONT_CSSNAME ) );
+
+
+ // Skin look and feel and property objects
+ int skinId = fo.getFieldInt( ForumOptions.FLD_SKIN_LAF_ID );
+ bean.setInt("skinLafId", skinId );
+
+ // Retrieve skin look and feel definition
+ ForumSkinLAFDef skinLafDef = new ForumSkinLAFDef();
+ skinLafDef.setDataContext( requestContext.getDataContext() );
+ skinLafDef.setRequestingUser( requestContext.getRequestingUser() );
+ skinLafDef.setField( ForumSkinLAFDef.FLD_SKIN_ID, skinId );
+ skinLafDef.retrieve();
+
+
+ bean.set( "skinLafDescription", skinLafDef.getField( ForumSkinLAFDef.FLD_SKIN_DESCRIP ) );
+
+ bean.set( "skinLafDescription", skinLafDef.getField( ForumSkinLAFDef.FLD_SKIN_NAME) );
+
+ // Retrieve skin look and feel properties
+ ForumSkinProperties skinProps = new ForumSkinProperties();
+ skinProps.clear();
+ skinProps.setDataContext( requestContext.getDataContext() );
+ skinProps.setRequestingUser( requestContext.getRequestingUser() );
+ skinProps.setField( ForumSkinProperties.FLD_SKIN_ID, skinId );
+ skinProps.setField( ForumSkinProperties.FLD_PROPERTY_NAME, ForumSkinProperties.SKIN_FOLDER_PROPERTY);
+ skinProps.retrieve();
+ bean.set( "skinFolder", skinProps.getField( ForumSkinProperties.FLD_TEXT_VALUE ) );
+
// Set the value of the text/css style that will display
// the forum messages.
Index: SendNotice.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/SendNotice.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/SendNotice.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/SendNotice.java -u -r1.6 -r1.7
Index: Browse.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java -u -r1.29 -r1.30
Index: Skinner.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Skinner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Skinner.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Skinner.java -u -r1.1 -r1.2
--- src/WEB-INF/src/com/jcorporate/eforum/controller/Skinner.java
+++ src/WEB-INF/src/com/jcorporate/eforum/controller/Skinner.java
@@ -6,6 +6,11 @@
import javax.servlet.Servlet;
import javax.servlet.ServletException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.apache.struts.tiles.actions.TilesAction;
+
import com.jcorporate.eforum.dbobj.ForumOptions;
import com.jcorporate.eforum.dbobj.ForumSkinLAFDef;
import com.jcorporate.eforum.dbobj.ForumSkinProperties;
@@ -16,9 +21,24 @@
import com.jcorporate.expresso.core.controller.ServletControllerRequest;
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.db.DBException;
+import com.jcorporate.expresso.core.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.StringUtil;
-
+import org.apache.struts.tiles.ComponentContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import com.jcorporate.expresso.core.registry.RequestRegistry;
+import com.jcorporate.expresso.core.security.ReadOnlyUser;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
/**
* An action controller to dynamically switch reprogram the URL from Tiles
@@ -35,9 +55,20 @@
* @author Peter Pilgrim, 04 March 2005
* @version $Id$
*/
-public class Skinner extends DBController {
+public class Skinner extends TilesAction {
private String thisClass = getClass().getName() + ".";
+ /**
+ * The Class instance of this <code>DispatchAction</code> class.
+ */
+ protected Class clazz = this.getClass();
+
+
+ /**
+ * The Logging instance.
+ */
+ protected static Logger log = Logger.getLogger( Skinner.class);
+
/** JSP attribute name for this controller's input */
public final static String CONST_PAGE = "page";
@@ -72,19 +103,32 @@
public final static String TOKEN_SKIN_INTEGER_VALUE="@SKIN_INTEGER_VALUE@";
/**
- * Defaults constructor
+ * The set of Method objects we have introspected for this class,
+ * keyed by method name. This collection is populated as different
+ * methods are called, so that introspection needs to occur only
+ * once per method name.
*/
- public Skinner() {
- super();
+ protected HashMap methods = new HashMap();
+
- State dispatchForward = new State("dispatchForward", "Reinterpret target URL & dispatch forward");
- addState(dispatchForward);
- setInitialState("dispatchForward");
+ /**
+ * The set of argument type classes for the reflected method call. These
+ * are the same for all calls, so calculate them only once.
+ */
+ protected Class[] types =
+ {
+ ComponentContext.class,
+ ActionMapping.class,
+ ActionForm.class,
+ HttpServletRequest.class,
+ HttpServletResponse.class};
- State dispatchInclude = new State("dispatchInclude", "Reinterpret target URL & dispatch include");
- addState(dispatchInclude);
- setSchema("com.jcorporate.eforum.ForumSchema");
+ /**
+ * Defaults constructor
+ */
+ public Skinner() {
+ super();
} /* SendNotice() */
/**
@@ -96,21 +140,234 @@
/**
+ * Process the specified HTTP request and create the corresponding HTTP
+ * response (or forward to another web component that will create it),
+ * with provision for handling exceptions thrown by the business logic.
+ * <br>
+ * Override this method to provide functionality.
+ *
+ * @param context The current Tile context, containing Tile attributes.
+ * @param mapping The ActionMapping used to select this instance.
+ * @param form The optional ActionForm bean for this request (if any).
+ * @param request The HTTP request we are processing.
+ * @param response The HTTP response we are creating.
+ *
+ * @exception Exception if the application business logic throws
+ * an exception
+ * @since Struts 1.1
+ */
+ public ActionForward execute(
+ ComponentContext context,
+ ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+
+ ConfigManager configManager = ConfigManager.getInstance();
+ ConfigManager.checkInitialized( request, servlet.getServletConfig() );
+
+ if (isCancelled(request)) {
+ ActionForward af = cancelled(context, mapping, form, request, response);
+ if (af != null) {
+ return af;
+ }
+ }
+ // Identify the request parameter containing the method name
+ String parameter = mapping.getParameter();
+ if (parameter == null) {
+ parameter = "state";
+ }
+
+ // Get the method's name. This could be overridden in subclasses.
+ String name = getMethodName(context, mapping, form, request, response, parameter);
+
+
+ // Prevent recursive calls
+ if ("execute".equals(name) || "perform".equals(name)){
+ throw new ServletException("Detected recursive loop attempting to call `execute' or `perform' method names.");
+ }
+
+ // Invoke the named method, and return the result
+ return dispatchMethod(context, mapping, form, request, response, name);
+ }
+
+
+
+ /**
+ * Method which is dispatched to when there is no value for specified
+ * request parameter included in the request. Subclasses of
+ * <code>DispatchAction</code> should override this method if they wish
+ * to provide default behavior different than throwing a ServletException.
+ */
+ protected ActionForward unspecified(
+ ComponentContext context,
+ ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ throw new ServletException("Unspecified method reached. Specify a dispatch method.");
+ }
+
+ /**
+ * Method which is dispatched to when the request is a cancel button submit.
+ * Subclasses of <code>DispatchAction</code> should override this method if
+ * they wish to provide default behavior different than returning null.
+ * @since Struts 1.2.0
+ */
+ protected ActionForward cancelled(
+ ComponentContext context,
+ ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
+
+ return null;
+ }
+
+ // ----------------------------------------------------- Protected Methods
+
+
+ /**
+ * Dispatch to the specified method.
+ * @since Struts 1.1
+ */
+ protected ActionForward dispatchMethod(
+ ComponentContext context,
+ ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ String name)
+ throws Exception {
+
+ // Make sure we have a valid method name to call.
+ // This may be null if the user hacks the query string.
+ if (name == null) {
+ return this.unspecified(context, mapping, form, request, response);
+ }
+
+ // Identify the method object to be dispatched to
+ Method method = null;
+ try {
+ method = getMethod(name);
+
+ } catch(NoSuchMethodException e) {
+// String message =
+// messages.getMessage("dispatch.method", mapping.getPath(), name);
+// log.error(message, e);
+ log.error( "Unable to execute dispatch method name:`"+name+"'", e );
+ throw e;
+ }
+
+ ActionForward forward = null;
+ try {
+ Object args[] = {context, mapping, form, request, response};
+ forward = (ActionForward) method.invoke(this, args);
+
+ } catch(ClassCastException e) {
+ log.error( "Unable to execute dispatch method name:`"+name+"'", e );
+ throw e;
+
+ } catch(IllegalAccessException e) {
+ log.error( "Unable to execute dispatch method name:`"+name+"'", e );
+ throw e;
+
+ } catch(InvocationTargetException e) {
+ // Rethrow the target exception if possible so that the
+ // exception handling machinery can deal with it
+ Throwable t = e.getTargetException();
+ if (t instanceof Exception) {
+ throw ((Exception) t);
+ } else {
+ log.error( "Unable to execute dispatch method name:`"+name+"'", e );
+ throw new ServletException(t);
+ }
+ }
+
+ // Return the returned ActionForward instance
+ return (forward);
+ }
+
+
+ /**
+ * Introspect the current class to identify a method of the specified
+ * name that accepts the same parameter types as the <code>execute</code>
+ * method does.
+ *
+ * @param name Name of the method to be introspected
+ *
+ * @exception NoSuchMethodException if no such method can be found
+ */
+ protected Method getMethod(String name)
+ throws NoSuchMethodException {
+
+ synchronized(methods) {
+ Method method = (Method) methods.get(name);
+ if (method == null) {
+ method = clazz.getMethod(name, types);
+ methods.put(name, method);
+ }
+ return (method);
+ }
+
+ }
+
+ /**
+ * Returns the method name, given a parameter's value.
+ *
+ * @param mapping The ActionMapping used to select this instance
+ * @param form The optional ActionForm bean for this request (if any)
+ * @param request The HTTP request we are processing
+ * @param response The HTTP response we are creating
+ * @param parameter The <code>ActionMapping</code> parameter's name
+ *
+ * @return The method's name.
+ * @since Struts 1.2.0
+ */
+ protected String getMethodName(
+ ComponentContext context,
+ ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ String parameter)
+ throws Exception {
+
+ // Identify the method name to be dispatched to.
+ // dispatchMethod() will call unspecified() if name is null
+ return request.getParameter(parameter);
+ }
+
+ /**
* Given an input URL substitute the tokens in order to reinterpret the target URL
*
* @param inputUrl the input url
* @param request the controller request
* @return the transformed url
*/
- public String substituteTokens( String inputUrl, ControllerRequest request )
- throws DBException
+ public String substituteTokens( String inputUrl, HttpServletRequest request )
+ throws Exception
{
String url = inputUrl;
+
+ int f = 0;
+ if ( url.indexOf( TOKEN_SKIN_FOLDER ) >= 0 ) {
+ f = 12;
+ }
+
+ // Verify we have Expresso initialised.
+ String dataContext = RequestRegistry.getDataContext() ;
+ ReadOnlyUser user = RequestRegistry.getUser();
// Retrieve the current forum options
ForumOptions fo = new ForumOptions();
- fo.setDataContext( request.getDataContext() );
- fo.setField( ForumOptions.FLD_UID, request.getRequestingUser().getUid() );
+ fo.setDataContext( dataContext );
+ fo.setField( ForumOptions.FLD_UID, user.getUid() );
if ( !fo.find() ) {
fo.checkDefaultValueIntegrity();
@@ -119,7 +376,8 @@
// Retrieve skin look and feel definition
ForumSkinLAFDef skinLafDef = new ForumSkinLAFDef();
- skinLafDef.setDataContext( request.getDataContext() );
+ skinLafDef.setDataContext( dataContext );
+ skinLafDef.setRequestingUser( user );
skinLafDef.setField( ForumSkinLAFDef.FLD_SKIN_ID, skinId );
skinLafDef.retrieve();
@@ -134,11 +392,12 @@
// Retrieve skin look and feel properties
ForumSkinProperties skinProps = new ForumSkinProperties();
skinProps.clear();
- skinProps.setDataContext( request.getDataContext() );
+ skinProps.setDataContext( dataContext );
+ skinProps.setRequestingUser( user );
skinProps.setField( ForumSkinProperties.FLD_SKIN_ID, skinId );
skinProps.setField( ForumSkinProperties.FLD_PROPERTY_NAME, ForumSkinProperties.SKIN_FOLDER_PROPERTY);
skinProps.retrieve();
- value = skinLafDef.getField( ForumSkinProperties.FLD_TEXT_VALUE );
+ value = skinProps.getField( ForumSkinProperties.FLD_TEXT_VALUE );
url = StringUtil.replace( url, TOKEN_SKIN_FOLDER, value );
return url;
@@ -149,15 +408,17 @@
*
* @param request The <code>ControllerRequest</code> object
* @param response the <code>ControllerResponse</code> objcet
- * @throws ControllerException
+ * @throws ServletException
*
*/
- protected void runDispatchForwardState(
- ControllerRequest request,
- ControllerResponse response)
- throws ControllerException
+ public ActionForward dispatchForward(
+ ComponentContext context,
+ ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
{
- ServletControllerRequest servReq = (ServletControllerRequest)request;
String pageBeforeUrl= request.getParameter( CONST_PAGE );
String pageAfterUrl = null;
@@ -167,26 +428,26 @@
// We flag to Expresso Framework that this state method is
// about to return its own binary stream content.
- response.setCustomResponse(true); /* ! */
- Servlet servlet = servReq.getCallingServlet();
// RequestDispatcher rd = servlet.getServletConfig().getServletContext().getRequestDispatcher(pageAfterUrl);
- RequestDispatcher rd = servReq.getHttpServletRequest().getRequestDispatcher( pageAfterUrl );
+ RequestDispatcher rd = request.getRequestDispatcher( pageAfterUrl );
+ rd.forward( request, response );
- rd.forward( servReq.getServletRequest(), servReq.getServletResponse() );
+ // Signal to Struts we have custom response output
+ return null;
}
catch (IOException ioe) {
- throw new ControllerException(
+ throw new ServletException(
"IO Failure: unable to dispatch forward to target URL`"+pageAfterUrl+"' ( "+
"before URL: `"+pageBeforeUrl+"' )", ioe );
}
catch (ServletException se) {
- throw new ControllerException(
+ throw new ServletException(
"Servlet failure: unable to dispatch forward to target URL`"+pageAfterUrl+"' ( "+
"before URL: `"+pageBeforeUrl+"' )", se );
}
catch (DBException de) {
- throw new ControllerException(
+ throw new ServletException(
"Database failure: unable to dispatch forward to target URL`"+pageAfterUrl+"' ( "+
"before URL: `"+pageBeforeUrl+"' )", de );
}
@@ -197,44 +458,44 @@
*
* @param request The <code>ControllerRequest</code> object
* @param response the <code>ControllerResponse</code> objcet
- * @throws ControllerException
+ * @throws ServletException
*
*/
- protected void runDispatchIncludeState(
- ControllerRequest request,
- ControllerResponse response)
- throws ControllerException
+ public ActionForward dispatchInclude(
+ ComponentContext context,
+ ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
{
- ServletControllerRequest servReq = (ServletControllerRequest)request;
-
+
String pageBeforeUrl= request.getParameter( CONST_PAGE );
String pageAfterUrl = null;
try {
pageAfterUrl = substituteTokens( pageBeforeUrl, request );
- // We flag to Expresso Framework that this state method is
- // about to return its own binary stream content.
- response.setCustomResponse(true); /* ! */
-
- Servlet servlet = servReq.getCallingServlet();
// RequestDispatcher rd = servlet.getServletConfig().getServletContext().getRequestDispatcher(pageAfterUrl);
- RequestDispatcher rd = servReq.getHttpServletRequest().getRequestDispatcher( pageAfterUrl );
- rd.include( servReq.getServletRequest(), servReq.getServletResponse() );
+ RequestDispatcher rd = request.getRequestDispatcher( pageAfterUrl );
+ rd.include( request, response );
+
+ // Signal to Struts we have custom response output
+ return null;
}
catch (IOException ioe) {
- throw new ControllerException(
+ throw new ServletException(
"IO Failure: unable to dispatch include to target URL`"+pageAfterUrl+"' ( "+
"before URL: `"+pageBeforeUrl+"' )", ioe );
}
catch (ServletException se) {
- throw new ControllerException(
+ throw new ServletException(
"Servlet failure: unable to dispatch include to target URL`"+pageAfterUrl+"' ( "+
"before URL: `"+pageBeforeUrl+"' )", se );
}
catch (DBException de) {
- throw new ControllerException(
+ throw new ServletException(
"Database failure: unable to dispatch include to target URL`"+pageAfterUrl+"' ( "+
"before URL: `"+pageBeforeUrl+"' )", de );
}
Index: Search.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Search.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Search.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Search.java -u -r1.12 -r1.13
Index: Personalise.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Personalise.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Personalise.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Personalise.java -u -r1.8 -r1.9
Index: ForumThread.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java -u -r1.10 -r1.11
Index: ForumTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumTextDef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumTextDef.java -u -r1.3 -r1.4
Index: ForumMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java -u -r1.20 -r1.21
Index: ForumSignature.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java -u -r1.7 -r1.8
Index: ForumMonoTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java -u -r1.6 -r1.7
Index: ForumGroup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java -u -r1.16 -r1.17
Index: ForumVarTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java -u -r1.7 -r1.8
Index: ForumOptions.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -u -r1.10 -r1.11
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
@@ -259,12 +259,14 @@
setMultiValued(FLD_MONO_TEXT_FONT_ID);
setMultiValued(FLD_HEADER_TEXT_FONT_ID);
setMultiValued(FLD_BANNER_TEXT_FONT_ID);
+ setMultiValued(FLD_SKIN_LAF_ID);
// Define lookup fields
setLookupObject(FLD_VAR_TEXT_FONT_ID, ForumVarTextDef.class.getName() );
setLookupObject(FLD_MONO_TEXT_FONT_ID, ForumMonoTextDef.class.getName() );
setLookupObject(FLD_HEADER_TEXT_FONT_ID, ForumTextDef.class.getName() );
setLookupObject(FLD_BANNER_TEXT_FONT_ID, ForumTextDef.class.getName() );
+ setLookupObject(FLD_SKIN_LAF_ID, ForumSkinLAFDef.class.getName() );
} /* setupFields() */
Index: ForumMail.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java -u -r1.8 -r1.9
Index: ForumAttachmentMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java -u -r1.8 -r1.9
Index: DefaultIndexProgressModel.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java -u -r1.12 -r1.13
Index: ForumSkinProperties.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinProperties.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinProperties.java -u -r1.2 -r1.3
Index: ForumSkinLAFDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java -u -r1.2 -r1.3
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java
@@ -73,6 +73,7 @@
return myValues;
}
+
/**
* @see com.jcorporate.expresso.core.dbobj.SecuredDBObject#setupFields
* @throws DBException if database fails
Index: ForumSecurity.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java -u -r1.13 -r1.14
Index: ForumAttachment.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java -u -r1.10 -r1.11
Index: SendNotice.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java -u -r1.11 -r1.12
Index: IndexMessages.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/job/IndexMessages.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/IndexMessages.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/IndexMessages.java -u -r1.11 -r1.12
Index: SearchIndexer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java -u -r1.11 -r1.12
Index: LuceneSearchIndexer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/search/lucene/LuceneSearchIndexer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/lucene/LuceneSearchIndexer.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/lucene/LuceneSearchIndexer.java -u -r1.14 -r1.15
Index: standardLayout.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/classic/templates/standardLayout.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/expresso/components/eforum/classic/templates/standardLayout.jsp -Lsrc/expresso/components/eforum/classic/templates/standardLayout.jsp -u -r1.1 -r1.2
Index: eforum.css
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/galaxywarp/styles/eforum.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/expresso/components/eforum/galaxywarp/styles/eforum.css -Lsrc/expresso/components/eforum/galaxywarp/styles/eforum.css -u -r1.1 -r1.2
--- src/expresso/components/eforum/galaxywarp/styles/eforum.css
+++ src/expresso/components/eforum/galaxywarp/styles/eforum.css
@@ -2,12 +2,12 @@
/* Eforum Standard Styles */
/********************************************************************************/
-td.jc-forumsheader{ color: #000000; background-color: #FFCC33;}
+td.jc-forumsheader { color: #000000; background-color: #FFCC33;}
th.jc-forumsheader { color: black; background-color: #FFCC33;}
td.jc-forumsheader a:visited { color: #000000; background-color: #FFCD33 }
td.jc-forumsheader a:link { color: #000000; background-color: #FFCD33}
-td.jc-forumsrow {color: black; background-color: white}
-td.jc-forumsrow-alt {color: black; background-color: #FFFFCC}
+td.jc-forumsrow {color: #000000; background-color: #FFCC99}
+td.jc-forumsrow-alt {color: #000000; background-color: #E0E0FF}
td.jc-forumgstatus {color:white; background-color: #FF0000}
td.jc-forumfooter {color: black; background-color: #DDDDDD;}
span.jc-forumfooter-highlight { color:black; background-color:white;}
@@ -15,9 +15,9 @@
a.jc-forum:visited {text-decoration: none; color: blue }
a.jc-forum:active {text-decoration: none; color: blue }
a.jc-forum:hover {text-decoration: none; color: blue }
-a.jc-forum-search:visited {text-decoration: none; color: white }
-a.jc-forum-search:active {text-decoration: none; color: white }
-a.jc-forum-search:hover {text-decoration: none; color: white }
+a.jc-forum-search:visited {text-decoration: none; color: blue }
+a.jc-forum-search:active {text-decoration: none; color: blue }
+a.jc-forum-search:hover {text-decoration: none; color: blue }
table.statuspage { background-image: url('../components/eforum/jsp/lightblue.gif'); background-repeat: repeat; font-family: Arial, Helvetica, sans-serif; font-size: 9pt; font-weight: bold; color: white;}
td.jc-divider { color: #FFCC33; background-color:black;}
form.jc-forums-data {color:black background-color:white;}
@@ -100,63 +100,63 @@
/* Proportional spaced text do not preserve white space */
.eforum-message-variable {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 10pt;
white-space: normal;
}
.eforum-message-variable8 {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 8pt;
white-space: normal;
}
.eforum-message-variable10 {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 10pt;
white-space: normal;
}
.eforum-message-variable12 {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 12pt;
white-space: normal;
}
.eforum-message-variable14 {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 14pt;
white-space: normal;
}
.eforum-message-variable16 {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 16pt;
white-space: normal;
}
.eforum-message-variable18 {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 18pt;
white-space: normal;
}
.eforum-message-variable24 {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 24pt;
white-space: normal;
}
.eforum-message-variable36 {
- color: #ffff66;
+ color: #000000;
font-family: Arial, Helvetica, sans-serif;
font-size: 36pt;
white-space: normal;
@@ -165,63 +165,63 @@
/* Non-proportional spaced text and preserves white space */
.eforum-message-monotype {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 10pt;
white-space: pre;
}
.eforum-message-monotype8 {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 8pt;
white-space: pre;
}
.eforum-message-monotype10 {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 10pt;
white-space: pre;
}
.eforum-message-monotype12 {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 12pt;
white-space: pre;
}
.eforum-message-monotype14 {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 14pt;
white-space: pre;
}
.eforum-message-monotype16 {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 16pt;
white-space: pre;
}
.eforum-message-monotype18 {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 18pt;
white-space: pre;
}
.eforum-message-monotype24 {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 24pt;
white-space: pre;
}
.eforum-message-monotype36 {
- color: #ffff66;
+ color: #000000;
font-family: "Courier New", Courier, Monotype, Monospace;
font-size: 36pt;
white-space: pre;
Index: standardLayout.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/galaxywarp/templates/standardLayout.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/expresso/components/eforum/galaxywarp/templates/standardLayout.jsp -Lsrc/expresso/components/eforum/galaxywarp/templates/standardLayout.jsp -u -r1.1 -r1.2
--- src/expresso/components/eforum/galaxywarp/templates/standardLayout.jsp
+++ src/expresso/components/eforum/galaxywarp/templates/standardLayout.jsp
@@ -74,11 +74,7 @@
<%-- <expresso:stylesheet component="eforum" /> --%>
<%-- Redirect to the correct skin LAF stylesheet --%>
-<c:url value="/eforum/Skinner.do" var="eforumStylesheetUrl" >
- <c:param name="state" value="dispatchInclude" />
- <c:param name="page" value="/expresso/components/eforum/@SKIN_FOLDER@/eforum.css" />
-<c:url/>
-<link rel="StyleSheet" href='<c:out value="${eforumStylesheetUrl}">' type="text/css" media="screen, print">
+<link rel="StyleSheet" href='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/styles/eforum.css" />' type="text/css" media="screen, print">
<%-- Load Jim Salyer's open source DHTML Menu --%>
@@ -106,14 +102,14 @@
<!-- BEGIN OF GALAXY WARP LOOK AND FEEL -->
<!-- ================================================================================ -->
-<table width="100%" border="1" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td rowspan="9" width="49" >AA
- <img src="images/spacer.gif" width="49" height="1" alt=""></td>
+ <td rowspan="9" width="49" ><!--AA-->
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />'width="49" height="1" alt=""></td>
<td colspan="2" width="87" >
- <img src="images/StarTrek_Look_and_Feel_02.gif" width=87 height=13 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_02.gif" />' width=87 height=13 alt=""></td>
<td colspan="4" rowspan="6" align="left" valign="middle" >
- <img src="images/spacer.gif" width="100%" height="1" alt="">
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="100%" height="1" alt="">
<!-- ============================================== -->
<!-- BEGINNING OF THE TOP TEXT AREA! -->
<!-- ============================================== -->
@@ -147,87 +143,87 @@
</tr>
<tr>
<td colspan="2" width="87" >
- <img src="images/StarTrek_Look_and_Feel_04.gif" width=87 height=28 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_04.gif" />' width=87 height=28 alt=""></td>
</tr>
<tr>
<td colspan="2" width="87" >
- <img src="images/StarTrek_Look_and_Feel_05.gif" width=87 height=11 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_05.gif" />' width=87 height=11 alt=""></td>
</tr>
<tr>
<td colspan="2" width="87" >
- <img src="images/StarTrek_Look_and_Feel_06.gif" width=87 height=10 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_06.gif" />' width=87 height=10 alt=""></td>
</tr>
<tr>
<td colspan="2" width="87" >
- <img src="images/StarTrek_Look_and_Feel_07.gif" width=87 height=19 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_07.gif" />'width=87 height=19 alt=""></td>
</tr>
<tr>
- <td colspan="2" width="87" background="images/StarTrek_Look_and_Feel_08.gif" height="19" >
- <img src="images/spacer.gif" width="87" height="1" alt="" ></td>
+ <td colspan="2" width="87" background='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_08.gif" />' height="19" >
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="87" height="1" alt="" ></td>
</tr>
<tr>
<td colspan="2" width="87" height="26" >
- <img src="images/StarTrek_Look_and_Feel_09.gif" width=87 height=26 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_09.gif" />' width=87 height=26 alt=""></td>
<td width="25" height="26" >
- <img src="images/StarTrek_Look_and_Feel_10.gif" width=25 height=26 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_10.gif" />' width=25 height=26 alt=""></td>
<td colspan="3" height="26" >
- <img src="images/StarTrek_Look_and_Feel_11.gif" width="100%" height=26 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_11.gif" />' width="100%" height=26 alt=""></td>
</tr>
<tr>
<td width="44" height="36" >
- <img src="images/StarTrek_Look_and_Feel_12.gif" width=44 height=36 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_12.gif" />' width=44 height=36 alt=""></td>
<td width="43" height="36" >
- <img src="images/StarTrek_Look_and_Feel_13.gif" width=43 height=36 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_13.gif" />' width=43 height=36 alt=""></td>
<td width="25" height="36" >
- <img src="images/StarTrek_Look_and_Feel_14.gif" width=25 height=36 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_14.gif" />' width=25 height=36 alt=""></td>
<td height="36" >
- <img src="images/StarTrek_Look_and_Feel_15.gif" width="100%" height=36 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_15.gif" />' width="100%" height=36 alt=""></td>
<td width="23" height="36" >
- <img src="images/StarTrek_Look_and_Feel_16.gif" width=23 height=36 alt=""></td>
- <td width="23" rowspan="2">BB
- <img src="images/spacer.gif" width="23" height="1" alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_16.gif" />' width=23 height=36 alt=""></td>
+ <td width="23" rowspan="2"><!--BB-->
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="23" height="1" alt=""></td>
</tr>
<tr>
<td colspan=5 height="19" >
- <img src="images/StarTrek_Look_and_Feel_18.gif" width="100%" height=19 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_18.gif" />' width="100%" height=19 alt=""></td>
</tr>
</table>
-<table width="100%" border="1" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr height="41" >
- <td rowspan="9" width="49" >CC
- <img src="images/spacer.gif" width="49" height="1" alt=""></td>
+ <td rowspan="9" width="49" ><!--CC-->
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif"/>' width="49" height="1" alt=""></td>
<td width="44" height="41" >
- <img src="images/StarTrek_Look_and_Feel_19.gif" width=44 height=41 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_19.gif" />' width=44 height=41 alt=""></td>
<td width="43" height="41" >
- <img src="images/StarTrek_Look_and_Feel_20.gif" width=43 height=41 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_20.gif" />' width=43 height=41 alt=""></td>
<td width="25" height="41" >
- <img src="images/StarTrek_Look_and_Feel_21.gif" width=25 height=41 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_21.gif" />' width=25 height=41 alt=""></td>
<td >
- <img src="images/StarTrek_Look_and_Feel_22.gif" width="100%" height=41 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_22.gif" />' width="100%" height=41 alt=""></td>
<td width="23" height="41" >
- <img src="images/StarTrek_Look_and_Feel_23.gif" width=23 height=41 alt=""></td>
- <td width="23" rowspan="9">DD
- <img src="images/spacer.gif" width="23" height="1" alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_23.gif" />' width=23 height=41 alt=""></td>
+ <td width="23" rowspan="9"><!--DD-->
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif"/>' width="23" height="1" alt=""></td>
</tr>
<tr height="25">
<td width="44" height="25">
- <img src="images/StarTrek_Look_and_Feel_24.gif" width=44 height=25 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_24.gif" />' width=44 height=25 alt=""></td>
<td width="43" height="25">
- <img src="images/StarTrek_Look_and_Feel_25.gif" width=43 height=25 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_25.gif" />' width=43 height=25 alt=""></td>
<td width="25" height="25">
- <img src="images/StarTrek_Look_and_Feel_26.gif" width=25 height=25 alt=""></td>
- <td colspan="2" rowspan="1" align="left" valign="top" >EE
- <img src="images/spacer.gif" width="100%" height=1 alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_26.gif" />' width=25 height=25 alt=""></td>
+ <td colspan="2" rowspan="1" align="left" valign="top" ><!--EE-->
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="100%" height=1 alt=""></td>
</tr>
<tr>
- <td colspan="2" width="87" background="images/StarTrek_Look_and_Feel_28.gif" style="height: 100%; " >FF
- <img src="images/spacer.gif" width="87" height="100%" alt=""></td>
- <td rowspan="1" width="25" >AA
- <img SRC="images/spacer.gif" width="25" height="100%" alt=""></td>
- <td colspan="2" rowspan="1" align="left" valign="top" >GG
- <img src="images/spacer.gif" width="100%" height=1 alt="">
+ <td colspan="2" width="87" background='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_28.gif" />' style="height: 100%; " ><!--FF-->
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="87" height="100%" alt=""></td>
+ <td rowspan="1" width="25" ><!--AA-->
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="25" height="100%" alt=""></td>
+ <td colspan="2" rowspan="1" align="left" valign="top" ><!--GG-->
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="100%" height=1 alt="">
<!-- ============================================== -->
<!-- BEGINNING OF THE BOTTOM TEXT AREA! -->
<!-- ============================================== -->
@@ -244,15 +240,15 @@
</tr>
<tr height="33">
<td colspan=2 width="87" height="33" >
- <img src="images/StarTrek_Look_and_Feel_30.gif" width=87 height=33 alt=""></TD>
- <td><img src="images/spacer.gif" width="25" height="100%" alt=""></td>
- <td colspan="2"><img src="images/spacer.gif" width="100%" height="1" alt=""></td>
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_30.gif" />' width=87 height=33 alt=""></td>
+ <td><img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="25" height="100%" alt=""></td>
+ <td colspan="2"><img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="100%" height="1" alt=""></td>
</tr>
<tr height="18" >
- <TD colspan=2 width="87" height="18" >
- <img src="images/StarTrek_Look_and_Feel_31.gif" width=87 height=18 alt=""></TD>
- <td><img src="images/spacer.gif" width="25" height="100%" alt=""></td>
- <td colspan="2"><img src="images/spacer.gif" width="100%" height="1" alt=""></td>
+ <td colspan=2 width="87" height="18" >
+ <img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/StarTrek_Look_and_Feel_31.gif" />' width=87 height=18 alt=""></td>
+ <td><img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="25" height="100%" alt=""></td>
+ <td colspan="2"><img src='<c:url value="/expresso/components/eforum/${forumProfile.map.skinFolder}/images/spacer.gif" />' width="100%" height="1" alt=""></td>
</tr>
</table>
Index: groups.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/jsp/groups.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/expresso/components/eforum/jsp/groups.jsp -Lsrc/expresso/components/eforum/jsp/groups.jsp -u -r1.9 -r1.10
--- src/expresso/components/eforum/jsp/groups.jsp
+++ src/expresso/components/eforum/jsp/groups.jsp
@@ -20,24 +20,6 @@
<%@ include file="../standard.inc" %>
-<html:html>
-<HEAD>
-<expresso:stylesheet/>
-<expresso:stylesheet component="eforum"/>
-<html:base/>
-<title>Discussion Topics</title></HEAD>
-<body class="jc-forums">
-<html:form action="/eforum/Search.do" styleClass="jc-noborder" method="GET">
-<%@ include file="status.inc" %>
-<%--</p>--%>
-<table width="100%" class="jc-divider" border="0" cellspacing="0">
-<tr valign="middle">
-<td class="jc-divider"><strong>Groups</strong></td>
-<td class="jc-divider" align="right">
-<%@ include file="searchcell.inc" %>
-</td>
-</tr>
-</table>
<logic:present property="project">
<bean:define id="project" property="project" type="java.lang.String"/>
</logic:present>
@@ -133,7 +115,4 @@
<br><p align="center"><A href="<%=contextPath%>/eforum/Browse.do">View your subscribed Groups in all projects.</A></p>
</logic:present>
-<p><img src="poweredby_ef.gif" width="88" height="25" border="0"/></p>
-</body>
-</html:html>
Index: messages.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/jsp/messages.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/expresso/components/eforum/jsp/messages.jsp -Lsrc/expresso/components/eforum/jsp/messages.jsp -u -r1.13 -r1.14
--- src/expresso/components/eforum/jsp/messages.jsp
+++ src/expresso/components/eforum/jsp/messages.jsp
@@ -88,12 +88,16 @@
<a href='<c:out value="${promptNewMessageUrl}" />' title='<bean:message key="global.createNewForumMessage.text" />' ><bean:message key="browseMessages.postNewMessage.text" /></a>
</td>
</tr>
+ <td colspan="2" align="left">
+ <%-- Create a link to reload the web page --%>
+ <c:url var="thePage" value="${controllerResponse.namedTransitions['browseMessages'].url}" />
+ <strong><small><a href='<c:out value="${thePage}" />' > <bean:message key="browseMessages.forumReload.text" /> </a></small></strong>
+ </td>
+ <tr>
+ </tr>
</table>
</html:form>
-<%-- Create a link to reload the web page --%>
-<c:url var="thePage" value="${controllerResponse.namedTransitions['browseMessages'].url}" />
-<strong><small><a href='<c:out value="${thePage}" />' > <bean:message key="browseMessages.forumReload.text" /> </a></small></strong><br>
<hr>
<!-- ================================================================================ -->
Index: threads.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/jsp/threads.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/expresso/components/eforum/jsp/threads.jsp -Lsrc/expresso/components/eforum/jsp/threads.jsp -u -r1.10 -r1.11
--- src/expresso/components/eforum/jsp/threads.jsp
+++ src/expresso/components/eforum/jsp/threads.jsp
@@ -67,45 +67,45 @@
</th>
</tr>
-<% int threadCount = 0; %>
-<logic:iterate id="eachThread" property="Threads">
-<% threadCount++;
- String cssClass;
- if (threadCount % 2 == 1) {
- cssClass ="jc-forumsrow";
- } else {
- cssClass = "jc-forumsrow-alt";
- }
-
- %>
- <tr class="<%= cssClass %>">
- <td class="<%= cssClass %>">
- <bean:define id="targetThreadId" name="eachThread" property="/ThreadId" type="java.lang.String"/>
- <%-- *DEBUG*
- ${eachThread.nestedMap['ThreadId'].content} =<c:out value="${eachThread.nestedMap['ThreadId'].content}" />
+ <% int threadCount = 0; %>
+ <logic:iterate id="eachThread" property="Threads">
+ <% threadCount++;
+ String cssClass;
+ if (threadCount % 2 == 1) {
+ cssClass ="jc-forumsrow";
+ } else {
+ cssClass = "jc-forumsrow-alt";
+ }
+
+ %>
+ <tr class="<%= cssClass %>">
+ <td class="<%= cssClass %>">
+ <bean:define id="targetThreadId" name="eachThread" property="/ThreadId" type="java.lang.String"/>
+ <%-- *DEBUG*
+ ${eachThread.nestedMap['ThreadId'].content} =<c:out value="${eachThread.nestedMap['ThreadId'].content}" />
+ --%>
+ <c:set var="forumThreadId" value="${eachThread.nestedMap['ThreadId'].content}" />
+ <c:url var="browseMessagesUrl" value="/eforum/Browse.do" >
+ <c:param name="state" value="browseMessages" />
+ <c:param name="GroupId" value="${GroupId}" />
+ <c:param name="ThreadId" value="${forumThreadId}" />
+ </c:url>
+ <a href='<c:out value="${browseMessagesUrl}" />' > <bean:write name="eachThread"/> </a>
+ </td>
+ <td class="<%= cssClass %>">
+ <bean:write name="eachThread" property="/LastPosting"/>
+ </td>
+ <td class="<%= cssClass %>">
+ <bean:write name="eachThread" property="/LastPostingBy"/>
+ </td>
+ <%-- Commented out to skip the confusion with no new messages listed
+ <td class="<%= cssClass %>"> 0 </td>
--%>
- <c:set var="forumThreadId" value="${eachThread.nestedMap['ThreadId'].content}" />
- <c:url var="browseMessagesUrl" value="/eforum/Browse.do" >
- <c:param name="state" value="browseMessages" />
- <c:param name="GroupId" value="${GroupId}" />
- <c:param name="ThreadId" value="${forumThreadId}" />
- </c:url>
- <a href='<c:out value="${browseMessagesUrl}" />' > <bean:write name="eachThread"/> </a>
- </td>
- <td class="<%= cssClass %>">
- <bean:write name="eachThread" property="/LastPosting"/>
- </td>
- <td class="<%= cssClass %>">
- <bean:write name="eachThread" property="/LastPostingBy"/>
- </td>
- <%-- Commented out to skip the confusion with no new messages listed
- <td class="<%= cssClass %>"> 0 </td>
- --%>
- <td class="<%= cssClass %>">
- <bean:write name="eachThread" property="/Count"/>
- </td>
- </tr>
-</logic:iterate>
+ <td class="<%= cssClass %>">
+ <bean:write name="eachThread" property="/Count"/>
+ </td>
+ </tr>
+ </logic:iterate>
</table>
<table width="100%" cellspacing="0">
@@ -125,27 +125,22 @@
<% } %>
</logic:iterate>
]
-</logic:present>
- </td>
- <td class="jc-forumfooter" align="right" >
- <c:url var="promptNewThreadUrl" value="/eforum/Browse.do" >
- <c:param name="state" value="promptNewThread" />
- <c:param name="GroupId" value="${GroupId}" />
- </c:url>
- <a href='<c:out value="${promptNewThreadUrl}" />' title='<bean:message key="global.startDiscussionThread.text" />' class="jc-forum" > <strong><bean:message key="browseMessages.startNewTopic.text" /></strong> </a>
-
-
- </td>
-
-</tr>
-</table>
+ </logic:present>
+ </td>
+ <td class="jc-forumfooter" align="right" >
+ <c:url var="promptNewThreadUrl" value="/eforum/Browse.do" >
+ <c:param name="state" value="promptNewThread" />
+ <c:param name="GroupId" value="${GroupId}" />
+ </c:url>
+ <a href='<c:out value="${promptNewThreadUrl}" />' title='<bean:message key="global.startDiscussionThread.text" />' class="jc-forum" > <strong><bean:message key="browseMessages.startNewTopic.text" /></strong> </a>
+ </td>
+ </tr>
-<% if (threadCount == 0) {
-%>
-<tr class="jc-forumsrow">
- <td colspan="5" class="jc-forumsrow" align="center"><span class="jc-emphasis">There
- are no topics in this group.</span></td>
-</tr>
-<% } %>
+ <% if (threadCount == 0) { %>
+ <tr class="jc-forumsrow">
+ <td colspan="5" class="jc-forumsrow" align="center"><span class="jc-emphasis">There
+ are no topics in this group.</span></td>
+ </tr>
+ <% } %>
</table>
Index: preamble10.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/jsp/preamble10.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/expresso/components/eforum/jsp/preamble10.jsp -Lsrc/expresso/components/eforum/jsp/preamble10.jsp -u -r1.2 -r1.3
--- src/expresso/components/eforum/jsp/preamble10.jsp
+++ src/expresso/components/eforum/jsp/preamble10.jsp
@@ -130,8 +130,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested1.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested1.attributes[CONST_GroupId]}" />
@@ -174,8 +174,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested2.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested2.attributes[CONST_GroupId]}" />
@@ -218,8 +218,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested3.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested3.attributes[CONST_GroupId]}" />
@@ -262,8 +262,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested4.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested4.attributes[CONST_GroupId]}" />
@@ -306,8 +306,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested5.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested5.attributes[CONST_GroupId]}" />
@@ -350,8 +350,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested6.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested6.attributes[CONST_GroupId]}" />
@@ -394,8 +394,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested7.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested7.attributes[CONST_GroupId]}" />
@@ -438,8 +438,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested8.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested8.attributes[CONST_GroupId]}" />
@@ -482,8 +482,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="<%= cssClass %>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="<%= cssClass %>" nowrap>
<c:set var="MessageId" value="${nested9.attributes[CONST_MessageId]}" />
<c:set var="GroupId" value="${nested9.attributes[CONST_GroupId]}" />
Index: browseMessages10.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/jsp/browseMessages10.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/expresso/components/eforum/jsp/browseMessages10.jsp -Lsrc/expresso/components/eforum/jsp/browseMessages10.jsp -u -r1.3 -r1.4
--- src/expresso/components/eforum/jsp/browseMessages10.jsp
+++ src/expresso/components/eforum/jsp/browseMessages10.jsp
@@ -167,8 +167,8 @@
<td colspan="3">
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
<a name='<c:out value="${nested1.attributes[\'MessageId\']}" />' >
@@ -199,7 +199,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested1.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -224,7 +224,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested1.attributes[CONST_Body]}" escapeXml="false" />
@@ -248,8 +248,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
@@ -281,7 +281,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested2.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -306,7 +306,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested2.attributes[CONST_Body]}" escapeXml="false" />
@@ -329,8 +329,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
<a name='<c:out value="${nested3.attributes[\'MessageId\']}" />' >
@@ -361,7 +361,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested3.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -386,7 +386,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested3.attributes[CONST_Body]}" escapeXml="false" />
@@ -409,8 +409,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
<a name='<c:out value="${nested4.attributes[\'MessageId\']}" />' >
@@ -441,7 +441,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested4.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -466,7 +466,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested4.attributes[CONST_Body]}" escapeXml="false" />
@@ -488,8 +488,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
@@ -521,7 +521,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested5.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -546,7 +546,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested5.attributes[CONST_Body]}" escapeXml="false" />
@@ -569,8 +569,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
@@ -602,7 +602,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested6.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -627,7 +627,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested6.attributes[CONST_Body]}" escapeXml="false" />
@@ -650,8 +650,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
@@ -683,7 +683,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested7.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -708,7 +708,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested7.attributes[CONST_Body]}" escapeXml="false" />
@@ -730,8 +730,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
@@ -763,7 +763,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested8.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -788,7 +788,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested8.attributes[CONST_Body]}" escapeXml="false" />
@@ -811,8 +811,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
<a name='<c:out value="${nested9.attributes[\'MessageId\']}" />' >
@@ -843,7 +843,7 @@
</td>
</tr>
<tr class="<%=cssClass%>" >
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" bgcolor="#9999FF" height="26" ><small>
<c:forEach items="${nested9.nestedMap[CONST_Attachments].nested}" var="Attachment" varStatus="status">
@@ -868,7 +868,7 @@
</small></td>
</tr>
<tr class="<%=cssClass%>">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'> </td>
<td colspan="3" class="<%=cssClass%>">
<span class='<c:out value="${forumProfile.map.messageTextFontCss}" />' >
<c:out value="${nested9.attributes[CONST_Body]}" escapeXml="false" />
@@ -890,8 +890,8 @@
%>
<table border="0" width="100%" cellspacing="0">
<tr class="jc-forumsheader">
- <td bgcolor="white" width='<c:out value="${marginWidth}" />'>
- <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="1" /> </td>
+ <td class="eForum-portalBackground" width='<c:out value="${marginWidth}" />'>
+ <img src='<c:url value="/expresso/components/eforum/images/spacer.gif" />' width='<c:out value="${marginWidth}" />' height="1" border="0" /> </td>
<td class="jc-forumsheader" nowrap>
<a name='<c:out value="${nested10.attributes[\'MessageId\']}" />' >
More information about the cvs
mailing list