Index: lams_tool_forum/build.xml
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -266,6 +266,7 @@
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
+				<include name="images/**"/>
 				<include name="jsps/**"/> 
 			</fileset>
 		</war>
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -170,6 +170,22 @@
             unique="true"
         />
 
+        <property
+            name="allowEdit"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_edit"
+        />
+
+        <property
+            name="allowRichEditor"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_rich_editor"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -73,7 +73,7 @@
 		
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			input="tiles:/authoring/forum/create" 
+			input="tiles:/authoring/forum/viewTopic" 
 			parameter="deleteTopic">
 		</action>
 		
@@ -91,17 +91,26 @@
 			name="messageForm" 
 			validate="false"
 			parameter="editTopic"
-			scope="request">
+			scope="session">
 			<forward name="success" path="tiles:/authoring/forum/editTopic" />
 		</action>
 		
+		<action path="/authoring/deleteAttachment"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="messageForm" 
+			validate="false"
+			parameter="deleteAttachment"
+			scope="session">
+			<forward name="success" path="tiles:/authoring/forum/editTopic" />
+		</action>
+		
 		<action path="/authoring/updateTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
 			input="tiles:/authoring/forum/editTopic" 
 			parameter="updateTopic"
-			scope="request">
+			scope="session">
 			<forward name="success" path="/authoring/viewTopic.do" />
 		</action>
 		
Index: lams_tool_forum/db/model/forum.clay
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -14,7 +14,7 @@
 <table-list>
 <table alias="" name="tl_lafrum11_attachment" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="130" y="235"/>
+<table-figure-bounds height="-1" width="-1" x="133" y="274"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -29,7 +29,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="version_id" remarks="">
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="file_version_id" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
 <variant type-name-pattern="BIGINT"/>
@@ -42,7 +42,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="type" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="file_type" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
@@ -56,7 +56,7 @@
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="uuid" remarks="">
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="file_uuid" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
 <variant type-name-pattern="BIGINT"/>
@@ -69,6 +69,12 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="create_date" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
 <column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="forum_uid" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
@@ -134,7 +140,7 @@
 </table>
 <table alias="" name="tl_lafrum11_forum" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="136" y="-1"/>
+<table-figure-bounds height="-1" width="-1" x="54" y="-15"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -280,6 +286,32 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="allow_edit" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="allow_rich_editor" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PRIMARY" remarks="">
 <primary-key-description></primary-key-description>
@@ -300,7 +332,7 @@
 </table>
 <table alias="" name="tl_lafrum11_forum_user" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="728" y="19"/>
+<table-figure-bounds height="-1" width="-1" x="752" y="133"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -371,7 +403,7 @@
 </table>
 <table alias="" name="tl_lafrum11_message" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="476" y="198"/>
+<table-figure-bounds height="-1" width="-1" x="558" y="248"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -576,7 +608,7 @@
 </table>
 <table alias="" name="tl_lafrum11_tool_session" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="477" y="8"/>
+<table-figure-bounds height="-1" width="-1" x="543" y="18"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -1,4 +1,9 @@
 SET FOREIGN_KEY_CHECKS=0;
+drop table if exists tl_lafrum11_attachment;
+drop table if exists tl_lafrum11_forum;
+drop table if exists tl_lafrum11_forum_user;
+drop table if exists tl_lafrum11_message;
+drop table if exists tl_lafrum11_tool_session;
 create table tl_lafrum11_attachment (
    uid bigint not null auto_increment,
    file_version_id bigint,
@@ -25,6 +30,8 @@
    content_in_use bit,
    define_later bit,
    content_id bigint unique,
+   allow_edit bit,
+   allow_rich_editor bit,
    primary key (uid)
 );
 create table tl_lafrum11_forum_user (
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -36,6 +36,8 @@
    content_in_use bit,
    define_later bit,
    content_id bigint unique,
+   allow_edit bit,
+   allow_rich_editor bit,
    primary key (uid)
 );
 create table tl_lafrum11_forum_user (
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -170,6 +170,22 @@
             unique="true"
         />
 
+        <property
+            name="allowEdit"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_edit"
+        />
+
+        <property
+            name="allowRichEditor"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_rich_editor"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -24,6 +24,8 @@
 	private boolean lockWhenFinished;
 	private boolean runOffline;
 	private boolean allowAnonym;
+	private boolean allowEdit;
+	private boolean allowRichEditor;
 	private String instructions;
 	private String onlineInstructions;
 	private String offlineInstructions;
@@ -341,4 +343,24 @@
 		.append(updated).append(createdBy)
 		.toHashCode();
 	}
+	/**
+	 * @hibernate.property column="allow_edit"
+	 * @return
+	 */
+	public boolean isAllowEdit() {
+		return allowEdit;
+	}
+	public void setAllowEdit(boolean allowEdit) {
+		this.allowEdit = allowEdit;
+	}
+	/**
+	 * @hibernate.property column="allow_rich_editor"
+	 * @return
+	 */
+	public boolean isAllowRichEditor() {
+		return allowRichEditor;
+	}
+	public void setAllowRichEditor(boolean allowRichEditor) {
+		this.allowRichEditor = allowRichEditor;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -21,4 +21,5 @@
 	public static final String DEFAULT_TITLE = "Forum";
 	//TODO:hard code!!! need to read from config
 	public static final String TOOL_URL_BASE = "/lams/tool/lafrum11/";
+	public static final String SUCCESS_FLAG = "SUCCESS_FLAG";
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -64,12 +64,13 @@
 forum.label.onlineFile = Online Attachments
 forum.label.offlineFile = Offline Attachments
 forum.label.lockWhenFinished = Lock When Finished
+label.authoring.advance.allow.edit=Allow Learner Edit
+label.authoring.advance.use.richeditor=Rich Editor for Learner 
 forum.label.forceOffline = Force Offline
 forum.label.allowAnnomity = Allow Annomity
 forum.attachment.label.delete = Delete Attachment
 forum.topic.label.delete = Delete Topic
 forum.link.createTopic = New Topic
-
 ##Topic
 topic.label.subject = Topic: 
 
@@ -81,6 +82,7 @@
 title.message.reply = Reply Message
 title.message.edit = Edit Message
 title.message.view=View Message
+title.message.delete=Delete Message
 message.label.subject = Subject
 message.label.body = Body
 message.label.attachment = Attachment
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -94,6 +94,9 @@
         if (param.equals("updateTopic")) {
         	return updateTopic(mapping, form, request, response);
         }
+        if (param.equals("deleteAttachment")) {
+        	return deleteAttachment(mapping, form, request, response);
+        }
         if (param.equals("finishTopic")) {
        		return finishTopic(mapping, form, request, response);
         }
@@ -198,6 +201,7 @@
 
 		topics.add(MessageDTO.getMessageDTO(message,user.getFirstName()+" "+user.getLastName()));
 		
+		request.setAttribute(ForumConstants.SUCCESS_FLAG,"SUCCESS");
 		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 		return mapping.findForward("success");
 	}
@@ -216,42 +220,8 @@
 			}
 			request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,topics);
     	}
-
-		StringBuffer sb = new StringBuffer();
-		sb.append("<table width=\"100%\" cellspacing=\"8\" align=\"CENTER\" cellspacing=\"3\" cellpadding=\"3\" class=\"form\">");
-		sb.append("<tr>");
-		sb.append("<td valign=\"MIDDLE\"><b>Topic</b></td>");
-		sb.append("<td colspan=\"2\" />");
-		sb.append("</tr>");
-		Iterator iter = topics.iterator();
-		for(int idx=0;iter.hasNext();idx++){
-//			MessageDTO msg = (MessageDTO) iter.next();
-//			sb.append("<tr>");
-//			sb.append("<td valign=\"MIDDLE\">");
-//			sb.append(msg.getSubject());
-//			sb.append("</td>");
-//			sb.append("<td colspan=\"2\" valign=\"MIDDLE\"><a href=\"javascript:loadDoc('");
-//			sb.append(ForumConstants.TOOL_URL_BASE);
-//			sb.append("authoring/deleteTopic.do?topicIndex=");
-//			sb.append(idx);
-//			//This parameter is useless for program logic. But when browser is IE
-//			//there is not a identify param for an item, IE won't submit the request to server.
-//			//For instance, if only use topicIndex and there are 3 topics list currently,
-//			//if user delete topicIndex=2 firstly, and next time, try to delete topicIndex=2 (old sequence is 3)
-//			//IE won't submit this request!
-//			sb.append("&create=").append(msg.getCreated().getTime());
-//			sb.append("\','topiclist')\"><b>Delete</b></a></td>"); 
-//		    sb.append("</tr>");
-		}
-		sb.append("</table>");
-		try {
-			PrintWriter out = response.getWriter();
-			out.print(sb.toString());
-			out.flush();
-		} catch (IOException e) {
-			log.error(e);
-		}
-		return null;
+		request.setAttribute(ForumConstants.SUCCESS_FLAG,"SUCCESS");
+		return mapping.getInputForward();
 	}
     public ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
@@ -283,6 +253,7 @@
 			if (topic != null) {
 				msgForm.setMessage(topic.getMessage());
 			}
+			request.setAttribute(ForumConstants.AUTHORING_TOPICS,topic);
     	}
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
     	return mapping.findForward("success");
@@ -323,6 +294,28 @@
 		return mapping.findForward("success");
     }
     
+    public ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws PersistenceException {
+		Long versionID = new Long(WebUtil.readLongParam(request,"versionID"));
+		Long uuID = new Long(WebUtil.readLongParam(request,"uuid"));
+		forumService = getForumManager();
+		forumService.deleteFromRepository(uuID,versionID);
+		
+    	List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
+		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
+		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
+		
+		if(topicIdx != -1){
+			MessageDTO oldMsg = (MessageDTO) topics.get(topicIdx);
+			if(oldMsg.getMessage()== null)
+				oldMsg.setMessage(new Message());
+			oldMsg.getMessage().setUpdated(new Date());
+			oldMsg.setHasAttachment(false);
+			oldMsg.getMessage().setAttachments(null);
+			
+		}
+    	return mapping.findForward("success");
+    }
     
     public ActionForward finishTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -111,7 +111,7 @@
 		</action>
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			input="tiles:/authoring/forum/create" 
+			input="tiles:/authoring/forum/viewTopic" 
 			parameter="deleteTopic">
 		</action>
 		<action path="/authoring/viewTopic"
@@ -127,16 +127,24 @@
 			name="messageForm" 
 			validate="false"
 			parameter="editTopic"
-			scope="request">
+			scope="session">
 			<forward name="success" path="tiles:/authoring/forum/editTopic" />
 		</action>
+		<action path="/authoring/deleteAttachment"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="messageForm" 
+			validate="false"
+			parameter="deleteAttachment"
+			scope="session">
+			<forward name="success" path="tiles:/authoring/forum/editTopic" />
+		</action>
 		<action path="/authoring/updateTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
 			input="tiles:/authoring/forum/editTopic" 
 			parameter="updateTopic"
-			scope="request">
+			scope="session">
 			<forward name="success" path="/authoring/viewTopic.do" />
 		</action>
 		<action path="/authoring/finishTopic"
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -30,7 +30,7 @@
     	<put name="body" value="/jsps/authoring/message/view.jsp"/>
 	</definition>
 	<definition name="tiles:/authoring/forum/editTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view"/>
+    	<put name="pageTitleKey" value="title.message.edit"/>
     	<put name="body" value="/jsps/authoring/message/edit.jsp"/>
 	</definition>
 	
Index: lams_tool_forum/web/includes/scripts.jsp
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/web/includes/scripts.jsp	(.../scripts.jsp)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/web/includes/scripts.jsp	(.../scripts.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -1,125 +1,11 @@
 <%@ page language="java" contentType="application/x-javascript" %>
 <%@ include file="/includes/taglibs.jsp" %>
 <!--
-/**
- ********************************************************************
- * Javascript functions required by various modules on the site.
- ********************************************************************
- */
 
-	// determine the screen width and height
-	var screenW = 640, screenH = 480;
-	if (parseInt(navigator.appVersion)>3) {
-		screenW = screen.width;
-		screenH = screen.height;
-	} else if (navigator.appName == "Netscape" 
-			&& parseInt(navigator.appVersion)==3 && navigator.javaEnabled()) {
-		var jToolkit = java.awt.Toolkit.getDefaultToolkit();
-		var jScreenSize = jToolkit.getScreenSize();
-		screenW = jScreenSize.width;
-		screenH = jScreenSize.height;
-	}
-	
-	var popupCfg = new Object();
-	popupCfg["product_type"] = new Array(300, 180, 100);
-	popupCfg["measurement_unit"] = new Array(200, 100, 100);
-	popupCfg["factory"] = new Array(300, 180, 100);
-	popupCfg["product_group"] = new Array(300, 200, 100);
-	popupCfg["tax_code"] = new Array(200, 200, 100);
-
-
-
-	/**
-	 * Launches the popup for code lookup.
-	 */
-	function launchPopup(formName, fieldName, type) {
-		WIDTH = 0;
-		HEIGHT = 1;
-		CODE_FRAME_SIZE = 2;
-		var url = '<html:rewrite page="/reference/index.do" />';
-		url += '?type=' + type
-			+ '&formName=' + formName
-			+ '&fieldName=' + fieldName
-			+ '&titleKey=' + ''
-			+ '&leftFrameSize=' + popupCfg[type][CODE_FRAME_SIZE];
-		width = popupCfg[type][WIDTH];
-		height = popupCfg[type][HEIGHT];
-		screenX = screenW - width - 10;
-		screenPos = 'screenX=' + screenX + ',screenY=0,top=0,left=' + screenX;
-		win = window.open(url, 'popup', 
-			'width=' + width + ',height=' + height + ',scrollbars,toolbars=no,resizable,'
-			+ screenPos);
-		win.window.focus();
-	}
-
-	/* 
-	 * added this onSubmit function makes sure all the 
-	 * values of targetList are selected when the form is submitted otherwise 
-	 * only the selected values are taken 
-	 */ 
-	function selectAllItems(form, listName) {
-		var theList = form[listName];
-		total = theList.options.length; 	
-		for (count = 0; count < total; ++count) {
-			theList.options[count].selected = true;
-		}
-	}
-
-	function moveItems(formname, sourceList, targetList) {
-		var theSourceList = document.forms[formname][sourceList];
-        var theTargetList = document.forms[formname][targetList];
-		// Run through this list twice, once to add, once to delete
-        total = theSourceList.options.length; 
-        for (count = 0; count < total; ++count) {
-			current_target = theSourceList.options[count]; 
-			if (current_target.selected) {
-				// remove the object from the current selectedaccountlist
-				target_name = current_target.text;
-				target_id   = current_target.value; 
-
-				// Create a new option
-				option = new Option(target_name, target_id, false, false);
-
-				// add it to the possible selectedaccountlist
-				theTargetList.options[theTargetList.options.length] = option;
-			}
-		}
-
-		for (count = theSourceList.options.length -1;  count >= 0; --count) {
-			if (theSourceList.options[count].selected) {
-				theSourceList.options[count] = null;
-			}
-		}
-	}
-
-	function moveAllItems(formname, sourceList, targetList) {
-		var theSourceList = document.forms[formname][sourceList];
-        var theTargetList = document.forms[formname][targetList];
-        // Run through the options and remove all selections
-        total = theSourceList.options.length;
-        for (count = 0; count < total; ++count) {
-			current_target = theSourceList.options[count];
-                    
-            // remove the object from the current selectedaccountlist
-            target_name = current_target.text;
-            target_id   = current_target.value; 
-            
-			// Create a new option
-            option = new Option(target_name, target_id, false, false); 
-            
-            // add it to the possible selectedaccountlist
-            theTargetList.options[theTargetList.options.length] = option;
-        }
-
-		// Remove old objects
-		theSourceList.options.length = 0; 
-	}
-	
-	
-
 	function closeWin(){
 		window.opener.parent.location.href = "<html:rewrite page='/authoring/finishTopic.do'/>";
 		window.close();
 	}
-		
+
+
 //-->
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -r9401077810a09c0dc2a77ff8bce04b1efeb25353 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 9401077810a09c0dc2a77ff8bce04b1efeb25353)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -11,6 +11,20 @@
 				</html:checkbox>
 			</td>
 		</tr>
+		<tr>
+			<td colspan="2 class="formcontrol">
+				<html:checkbox property="forum.allowEdit" value="1">
+					<fmt:message key="label.authoring.advance.allow.edit" />
+				</html:checkbox>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2 class="formcontrol">
+				<html:checkbox property="forum.allowRichEditor" value="1">
+					<fmt:message key="label.authoring.advance.use.richeditor" />
+				</html:checkbox>
+			</td>
+		</tr>
 		<!-- Button Row -->
 		<tr><td colspan="2"><html:errors/></td></tr>
 		<tr>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -1,13 +1,22 @@
 <%@ include file="/includes/taglibs.jsp" %>
 <script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+<script type="text/javascript">
+	function success(){
+		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
+		if(flag == "SUCCESS"){
+			closeWin();
+		}
+	}
+	success();
+</script>
 
 <html:errors property="error" />
 <div align="center">
 <html:form action="/authoring/createTopic.do" focus="message.subject"
 	onsubmit="return validateMessageForm(this);"  enctype="multipart/form-data">
 <fieldset>
 <%@ include file="/jsps/message/topiclist.jsp" %>
-<%@ include file="/jsps/message/form.jsp" %>
+<%@ include file="/jsps/message/topicform.jsp" %>
  </fieldset>
  </html:form>
 </div>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -6,7 +6,7 @@
 	onsubmit="return validateMessageForm(this);"  enctype="multipart/form-data">
 	<fieldset>
 		<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
-		<%@ include file="/jsps/message/form.jsp" %>
+		<%@ include file="/jsps/message/topiceditform.jsp" %>
 	 </fieldset>
  </html:form>
 </div>
Fisheye: Tag 3de24b3fb4e2ead20d187f4b5000464ae2791262 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/message/form.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/message/topiceditform.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/message/topiceditform.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/message/topiceditform.jsp	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -0,0 +1,56 @@
+
+<table width="80%" cellspacing="8" align="CENTER" class="forms">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
+		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
+			 tabindex="1" property="message.subject" /> 
+			 <html:errors property="message.subject" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:textarea rows="10" cols="60"
+			tabindex="2" property="message.body" /> 
+			<BR><html:errors property="message.body" /></td>
+	</tr>
+	<tr>
+		<td>
+			<b><bean:message key="message.label.attachment" /></b>
+		</td>
+		<td>
+			<c:forEach var="file" items="${topic.message.attachments}">
+				<c:set var="downloadURL">
+						<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+				</c:set>
+				<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+					<c:out value="${file.fileName}" />
+				</a>
+				<c:set var="deleteURL">
+						<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}"/>
+				</c:set>
+				&nbsp;
+				<a href="<c:out value='${deleteURL}'/>">
+					<fmt:message key="label.delete" />
+				</a>					
+			</c:forEach>
+		</td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"></td>
+		<td valign="MIDDLE">
+			&nbsp;&nbsp;<html:file tabindex="3"
+				property="attachmentFile" /> <html:errors
+				property="message.attachment" />
+		</td>
+	</tr>
+		<td>&nbsp;&nbsp;
+			<html:submit>
+				<bean:message key="button.submit" />
+			</html:submit>
+		</td>
+		<td>
+			<html:button property="done" onclick="closeWin()">
+				<bean:message key="button.done" />
+			</html:button>
+		</td>
+	</tr>
+</table>
Index: lams_tool_forum/web/jsps/message/topicform.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/message/topicform.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/message/topicform.jsp	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -0,0 +1,28 @@
+<table width="80%" cellspacing="8" align="CENTER" class="forms">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
+		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
+			 tabindex="1" property="message.subject" /> 
+			 <html:errors property="message.subject" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
+		<td valign="MIDDLE">&nbsp;&nbsp;<html:textarea rows="10" cols="60"
+			tabindex="2" property="message.body" /> 
+			<BR><html:errors property="message.body" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.attachment" /></b></td>
+		<td valign="MIDDLE">
+			&nbsp;&nbsp;<html:file tabindex="3"
+				property="attachmentFile" /> <html:errors
+				property="message.attachment" />
+		</td>
+	</tr>
+		<td>&nbsp;&nbsp;
+			<html:submit>
+				<bean:message key="button.submit" />
+			</html:submit>
+		</td>
+	</tr>
+</table>
Index: lams_tool_forum/web/jsps/message/topicview.jsp
===================================================================
diff -u -re2c7e6acfd72899694b4d8ba5cb4021a4db1a6fc -r3de24b3fb4e2ead20d187f4b5000464ae2791262
--- lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision e2c7e6acfd72899694b4d8ba5cb4021a4db1a6fc)
+++ lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
@@ -1,61 +1,72 @@
 <div align="center">
+<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+<script type="text/javascript">
+	function success(){
+		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
+		if(flag == "SUCCESS"){
+			closeWin();
+		}
+	}
+	success();
+</script>
+
 <div id="topicview">
-<div id="datatablecontainer">
-<BR>
-<table width="100%" align="CENTER" class="form" border="0" cellspacing="0">
-	<tr>
-		<th valign="MIDDLE" scope="col" >
-			<span style="font-size:25px"><c:out value="${topic.message.subject}" /></span>
-		</th>
-	</tr>
-	<tr>
-		<th scope="col" >
-			<fmt:message key="lable.topic.subject.by"/> <c:out value="${topic.author}"/> - 
-			<fmt:formatDate value="${topic.message.created}" type="time" timeStyle="short" />
-			<fmt:formatDate value="${topic.message.created}" type="date" dateStyle="full" />
-		</th>
-	</tr>
-	<tr>
-		<td>
-			<br>
-			<c:out value="${topic.message.body}" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<br>
-			<c:forEach var="file" items="${topic.message.attachments}">
-				<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
-					</c:set>
-					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-						<c:out value="${file.fileName}" />
-					</a>
-			</c:forEach>
-		</td>
-	</tr>
-	<tr>
-		<td align="right">
-			<br>
-			<c:set var="edittopic">
-				<html:rewrite page="/authoring/editTopic.do?topicIndex=${topicIndex}&create=${topic.message.created.time}" />
-			</c:set> 
-			<html:link href="${edittopic}">
-				<b><fmt:message key="label.edit" /></b>
-			</html:link>
-			
-			<c:set var="deletetopic">
-				<html:rewrite page="/authoring/deleteTopic.do?topicIndex=${topicIndex}" />
-			</c:set> 
-			<html:link href="${deletetopic}" onclick="closeWin()">
-				<b><fmt:message key="label.delete" /></b>
-			</html:link>
-			<html:link href="javascript:closeWin()">
-				<b><fmt:message key="label.done" /></b>
-			</html:link>
-		</td>
-	</tr>
-</table>
+	<div id="datatablecontainer">
+	<BR>
+	<table width="100%" align="CENTER" class="form" border="0" cellspacing="0">
+		<tr>
+			<th valign="MIDDLE" scope="col" >
+				<span style="font-size:25px"><c:out value="${topic.message.subject}" /></span>
+			</th>
+		</tr>
+		<tr>
+			<th scope="col" >
+				<fmt:message key="lable.topic.subject.by"/> <c:out value="${topic.author}"/> - 
+				<fmt:formatDate value="${topic.message.created}" type="time" timeStyle="short" />
+				<fmt:formatDate value="${topic.message.created}" type="date" dateStyle="full" />
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<br>
+				<c:out value="${topic.message.body}" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<br>
+				<c:forEach var="file" items="${topic.message.attachments}">
+					<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+						</c:set>
+						<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+							<c:out value="${file.fileName}" />
+						</a>
+				</c:forEach>
+			</td>
+		</tr>
+		<tr>
+			<td align="right">
+				<br>
+				<c:set var="edittopic">
+					<html:rewrite page="/authoring/editTopic.do?topicIndex=${topicIndex}&create=${topic.message.created.time}" />
+				</c:set> 
+				<html:link href="${edittopic}">
+					<b><fmt:message key="label.edit" /></b>
+				</html:link>
+				
+				<c:set var="deletetopic">
+					<html:rewrite page="/authoring/deleteTopic.do?topicIndex=${topicIndex}" />
+				</c:set> 
+				<html:link href="${deletetopic}">
+					<b><fmt:message key="label.delete" /></b>
+				</html:link>
+				<html:link href="javascript:closeWin()">
+					<b><fmt:message key="label.done" /></b>
+				</html:link>
+			</td>
+		</tr>
+	</table>
+	</div>
 </div>
 </div>
-</div>