[cvs] eforum commit by ppilgrim: The latest changes from lead.
JCorporate Ltd
jcorp at jcorporate.com
Sat Jun 18 10:14:46 UTC 2005
Log Message:
-----------
The latest changes from lead. Added Skinnable look and feel and extend personalisation to store a skin laf per user. Compiles but this is work in progress expected a bug or two with the tiles and Skinner.do, SkinLAFDef, SkinLAFProperties
Modified Files:
--------------
eforum/src/WEB-INF/config:
eforum-config.xml
eforum/src/WEB-INF/src/com/jcorporate/eforum:
ForumSchema.java
ForumUtils.java
MessagesBundle.properties
eforum/src/WEB-INF/src/com/jcorporate/eforum/controller:
Browse.java
Personalise.java
Search.java
SendNotice.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
ForumSubscribe.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/jsp:
editOptions.jsp
Revision Data
-------------
Index: SearchIndexer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java -u -r1.10 -r1.11
Index: eforum-config.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/config/eforum-config.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/WEB-INF/config/eforum-config.xml -Lsrc/WEB-INF/config/eforum-config.xml -u -r1.12 -r1.13
--- src/WEB-INF/config/eforum-config.xml
+++ src/WEB-INF/config/eforum-config.xml
@@ -48,6 +48,10 @@
<forward name="promptEditOptionsForm" path=".eforum.editOptions" />
<forward name="processEditOptionsForm" path=".eforum.confirm" />
</action>
+ <!-- Skinner -->
+ <action path="/eforum/Skinner" type="com.jcorporate.eforum.controller.Skinner" name="default" scope="request" validate="false">
+ <forward name="information" path="/expresso/components/eforum/jsp/information.jsp"/>
+ </action>
<!-- Send Email Notice -->
<action path="/eforum/SendNotice" type="com.jcorporate.eforum.controller.SendNotice" name="default" scope="request" validate="false">
<forward name="information" path="/expresso/components/eforum/jsp/information.jsp"/>
Index: ForumSchema.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java -u -r1.21 -r1.22
--- src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java
+++ src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java
@@ -44,6 +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);
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.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumUtils.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumUtils.java -u -r1.4 -r1.5
Index: MessagesBundle.properties
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/MessagesBundle.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/MessagesBundle.properties -Lsrc/WEB-INF/src/com/jcorporate/eforum/MessagesBundle.properties -u -r1.12 -r1.13
--- src/WEB-INF/src/com/jcorporate/eforum/MessagesBundle.properties
+++ src/WEB-INF/src/com/jcorporate/eforum/MessagesBundle.properties
@@ -355,6 +355,7 @@
editOptions.wordWrapLength = Word Wrap Length
editOptions.headerTextFont = Header Text Font Style
editOptions.bannerTextFont = Banner Text Font Style
+editOptions.skinLaf = Skin Look & Feel
# ---------------------------------------------
Index: SendNotice.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/SendNotice.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/SendNotice.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/SendNotice.java -u -r1.5 -r1.6
Index: Browse.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java -u -r1.28 -r1.29
Index: Search.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Search.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Search.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Search.java -u -r1.11 -r1.12
Index: Personalise.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Personalise.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Personalise.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Personalise.java -u -r1.7 -r1.8
--- src/WEB-INF/src/com/jcorporate/eforum/controller/Personalise.java
+++ src/WEB-INF/src/com/jcorporate/eforum/controller/Personalise.java
@@ -6,6 +6,7 @@
import org.apache.log4j.Logger;
import com.jcorporate.eforum.ForumSchema;
+import com.jcorporate.eforum.ForumUtils;
import com.jcorporate.eforum.dbobj.ForumOptions;
import com.jcorporate.eforum.dbobj.ForumSignature;
import com.jcorporate.expresso.core.controller.Block;
@@ -94,6 +95,9 @@
public final static String CONST_BANNER_TEXT_FONT = "bannerTextFont";
/** JSP attribute name for this controller's input */
+ public final static String CONST_SKIN_LAF = "skinLaf";
+
+ /** JSP attribute name for this controller's input */
// public final static String CONST_ = "";
/**
@@ -135,6 +139,9 @@
ControllerResponse response)
throws ControllerException, DBException
{
+ // Generate personalisation bean
+ ForumUtils.generateForumProfile( request );
+
// Retrieve the current forum options
ForumOptions fo = new ForumOptions();
fo.setDataContext( request.getDataContext() );
@@ -288,6 +295,14 @@
oneInput.setDefaultValue( fo.getField( ForumOptions.FLD_BANNER_TEXT_FONT_ID ));
optionsBlock.add(oneInput);
+ oneInput = new Input(CONST_SKIN_LAF);
+ oneInput.setType( Input.ATTRIBUTE_DROPDOWN );
+ oneInput.setValidValues( fo.getValidValuesList( ForumOptions.FLD_SKIN_LAF_ID ));
+ oneInput.setLabel(CONST_SKIN_LAF);
+ oneInput.setDefaultValue( fo.getField( ForumOptions.FLD_SKIN_LAF_ID ));
+ optionsBlock.add(oneInput);
+
+
Transition submit = new Transition("processEditOptionsForm", this);
submit.setLabel( "Submit" );
// t.addParam("GroupId", request.getParameter("GroupId"));
@@ -327,6 +342,7 @@
fo.setField( ForumOptions.FLD_WORD_WRAP_LENGTH, request.getParameter( CONST_WORD_WRAP_LENGTH ) );
fo.setField( ForumOptions.FLD_HEADER_TEXT_FONT_ID, request.getParameter( CONST_HEADER_TEXT_FONT ) );
fo.setField( ForumOptions.FLD_BANNER_TEXT_FONT_ID, request.getParameter( CONST_BANNER_TEXT_FONT ) );
+ fo.setField( ForumOptions.FLD_SKIN_LAF_ID, request.getParameter( CONST_SKIN_LAF ) );
// fo.setField( ForumOptions.FLD_, request.getParameter( CONST_ ) );
fo.addOrUpdate();
@@ -357,3 +373,6 @@
response.add(actionButton);
}
}
+
+// Fini
+
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.13
retrieving revision 1.14
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.13 -r1.14
Index: ForumThread.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java -u -r1.9 -r1.10
Index: ForumTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumTextDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumTextDef.java -u -r1.2 -r1.3
Index: ForumMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java -u -r1.19 -r1.20
Index: ForumSignature.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java -u -r1.6 -r1.7
Index: ForumMonoTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java -u -r1.5 -r1.6
Index: ForumGroup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java -u -r1.15 -r1.16
Index: ForumVarTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java -u -r1.6 -r1.7
Index: ForumOptions.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -u -r1.9 -r1.10
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
@@ -242,7 +242,7 @@
setDefaultValue( FLD_VAR_TEXT_FONT_ID, "3" );
setDefaultValue( FLD_HEADER_TEXT_FONT_ID, "4" );
setDefaultValue( FLD_BANNER_TEXT_FONT_ID, "5" );
-
+ setDefaultValue( FLD_SKIN_LAF_ID, "2" );
// TECH NOTE:
// Here follows an real example of automatic look up of
Index: ForumMail.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java -u -r1.7 -r1.8
Index: ForumAttachmentMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java -u -r1.7 -r1.8
Index: DefaultIndexProgressModel.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java -u -r1.11 -r1.12
Index: ForumSubscribe.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java -u -r1.17 -r1.18
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java
@@ -300,7 +300,7 @@
{
ForumSubscribe subscriber = new ForumSubscribe();
subscriber.setDataContext(getDataContext());
- subscriber.setField( FLD_UID, SuperUser.SYSTEM_UID );
+ subscriber.setField( FLD_UID, 3 /*SuperUser.SYSTEM_UID*/ );
subscriber.setField( FLD_MODERATOR, "Y" );
subscriber.setField( FLD_FORUM_ADMIN, "Y" );
subscriber.setField( FLD_UPLOAD_ATTACHMENTS, "Y" );
Index: ForumSkinProperties.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinProperties.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinProperties.java -u -r1.1 -r1.2
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinProperties.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinProperties.java
@@ -1,7 +1,9 @@
package com.jcorporate.eforum.dbobj;
+import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
+import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.ReadOnlyUser;
/**
@@ -33,6 +35,11 @@
/** Data field name constant */
// public static final String FLD__ = "Skin__";
+ /** Property name */
+ public final static String SKIN_AUTHOR_PROPERTY = "SKIN_AUTHOR";
+ /** Property name */
+ public final static String SKIN_FOLDER_PROPERTY = "SKIN_FOLDER";
+
/**
* Default constructor
* @see com.jcorporate.expresso.core.dbobj.SecuredDBObject#SecuredDBObject
@@ -57,6 +64,40 @@
}
/**
+ * Enhancement data object creation for Forum Options.
+ * @throws DBException
+ */
+ public synchronized void add() throws DBException {
+ checkDefaultValueIntegrity();
+ super.add();
+ }
+
+
+ /**
+ * Custom method to check value integrity of this data object
+ * @see com.jcorporate.expresso.core.dbobj.SecuredDBObject#setupFields
+ * @throws DBException
+ */
+ public void checkDefaultValueIntegrity() throws DBException
+ {
+ // Retrieve all the field names
+ DataObjectMetaData metaData = getMetaData();
+ String fieldNames[] = metaData.getFields();
+
+ for (int k = 0; k < fieldNames.length; ++k) {
+ // For all field names which are not keys
+ if (!metaData.getFieldMetadata(fieldNames[k]).isKey() ) {
+ // Check if this field value is empty or not.
+ if ( StringUtil.isBlankOrNull( getField(fieldNames[k]) )) {
+ // This field is empty. Attempt to use the default value if possible.
+ String defval = metaData.getDefaultValue( fieldNames[k] );
+ if ( defval != null )
+ setField( fieldNames[k] , defval );
+ }
+ }
+ }
+ }
+ /**
* @see com.jcorporate.expresso.core.dbobj.SecuredDBObject#setupFields
* @throws DBException if database fails
*/
@@ -72,6 +113,12 @@
addField(FLD_INT_VALUE, "int", 0, false, "FN_SkinIntValue");
addField(FLD_DOUBLE_VALUE, "double", 0, false, "FN_SkinDoubleValue");
+ // Set table column fields that have a default values, if you as the developer
+ // do not override them.
+ setDefaultValue( FLD_TEXT_VALUE, "" );
+ setDefaultValue( FLD_INT_VALUE, "0" );
+ setDefaultValue( FLD_DOUBLE_VALUE, "0.0" );
+
// Define the primary key fields
addKey(FLD_SKIN_ID);
addKey(FLD_PROPERTY_NAME);
@@ -86,30 +133,43 @@
{
ForumSkinProperties skinProps;
+ // **** CLASSIC ****
skinProps = new ForumSkinProperties();
skinProps.setDataContext(getDataContext());
skinProps.setField( FLD_SKIN_ID, ForumSkinLAFDef.CLASSIC_SKIN_LAF_ID );
- skinProps.setField( FLD_PROPERTY_NAME, "SKIN_FOLDER");
+ skinProps.setField( FLD_PROPERTY_NAME, SKIN_FOLDER_PROPERTY );
skinProps.setField( FLD_TEXT_VALUE, "classic");
- // skinProps.setField( FLD_INT_VALUE, "");
- // skinProps.setField( FLD_DOUBLE_VALUE, "");
- // skinProps.setField( FLD_, "");
skinProps.addIfNeeded();
+ skinProps = new ForumSkinProperties();
+ skinProps.setDataContext(getDataContext());
+ skinProps.setField( FLD_SKIN_ID, ForumSkinLAFDef.CLASSIC_SKIN_LAF_ID );
+ skinProps.setField( FLD_PROPERTY_NAME, SKIN_AUTHOR_PROPERTY );
+ skinProps.setField( FLD_TEXT_VALUE, "Original eForum designer");
+ skinProps.addIfNeeded();
+
+ // **** GALAXY WARP ****
skinProps = new ForumSkinProperties();
skinProps.setDataContext(getDataContext());
skinProps.setField( FLD_SKIN_ID, ForumSkinLAFDef.GALAXY_WARP_SKIN_LAF_ID );
- skinProps.setField( FLD_PROPERTY_NAME, "SKIN_FOLDER");
+ skinProps.setField( FLD_PROPERTY_NAME, SKIN_FOLDER_PROPERTY );
skinProps.setField( FLD_TEXT_VALUE, "galaxywarp");
+ skinProps.addIfNeeded();
+
+ skinProps = new ForumSkinProperties();
+ skinProps.setDataContext(getDataContext());
+ skinProps.setField( FLD_SKIN_ID, ForumSkinLAFDef.GALAXY_WARP_SKIN_LAF_ID );
+ skinProps.setField( FLD_PROPERTY_NAME, SKIN_AUTHOR_PROPERTY );
+ skinProps.setField( FLD_TEXT_VALUE, "Peter Pilgrim");
+ skinProps.addIfNeeded();
+
+ // Spare Tyres
// skinProps.setField( FLD_INT_VALUE, "");
// skinProps.setField( FLD_DOUBLE_VALUE, "");
// skinProps.setField( FLD_, "");
- skinProps.addIfNeeded();
-
}
}
// End
-
Index: ForumSkinLAFDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java -u -r1.1 -r1.2
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSkinLAFDef.java
@@ -29,12 +29,6 @@
/** Data field name constant */
public static final String FLD_SKIN_DESCRIP = "Skin_Descrip";
/** Data field name constant */
- public static final String FLD_SKIN_TEXT_VALUE = "Skin_Text_Value";
- /** Data field name constant */
- public static final String FLD_SKIN_INT_VALUE = "Skin_Int_Value";
- /** Data field name constant */
- public static final String FLD_SKIN_DOUBLE_VALUE = "Skin_Double_Value";
- /** Data field name constant */
// public static final String FLD__ = "Skin__";
/** Skin look and feel identifier */
Index: ForumSecurity.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java -u -r1.12 -r1.13
Index: ForumAttachment.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java -u -r1.9 -r1.10
Index: SendNotice.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java -u -r1.10 -r1.11
Index: IndexMessages.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/job/IndexMessages.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/IndexMessages.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/IndexMessages.java -u -r1.10 -r1.11
Index: editOptions.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/expresso/components/eforum/jsp/editOptions.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/expresso/components/eforum/jsp/editOptions.jsp -Lsrc/expresso/components/eforum/jsp/editOptions.jsp -u -r1.5 -r1.6
--- src/expresso/components/eforum/jsp/editOptions.jsp
+++ src/expresso/components/eforum/jsp/editOptions.jsp
@@ -164,6 +164,10 @@
<td><bean:message key="editOptions.bannerTextFont" /></td>
<td><expresso:InputTag name="bannerTextFont" /></td>
</tr>
+ <tr>
+ <td><bean:message key="editOptions.skinLaf" /></td>
+ <td><expresso:InputTag name="skinLaf" /></td>
+ </tr>
<%--
<tr>
<td><bean:message key="editOptions." /></td>
More information about the cvs
mailing list