Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r01901ddf0401e83d85086b01e71fd7101b1017cc -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 01901ddf0401e83d85086b01e71fd7101b1017cc)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -82,8 +82,8 @@
 		
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			input="tiles:/authoring/forum/viewTopic" 
 			parameter="deleteTopic">
+			<forward name="success" path="/jsps/authoring/message/delete.jsp" />
 		</action>
 		
 		<action path="/authoring/viewTopic"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
diff -u -rde48694e8eae9839c1274a8927d939e83258a50b -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision de48694e8eae9839c1274a8927d939e83258a50b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -104,4 +104,6 @@
 button.submit = Submit
 button.on = On
 button.off = Off
+button.add = Add
+button.cancel = Cancel
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r01901ddf0401e83d85086b01e71fd7101b1017cc -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 01901ddf0401e83d85086b01e71fd7101b1017cc)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -21,7 +21,6 @@
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Date;
@@ -45,7 +44,6 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.upload.FormFile;
-import org.apache.struts.upload.MultipartRequestWrapper;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
@@ -623,7 +621,7 @@
     	}
 		
 		request.setAttribute(ForumConstants.SUCCESS_FLAG,"DELETE_SUCCESS");
-		return mapping.getInputForward();
+		return mapping.findForward("success");
 	}
     /**
      * Diplay a special topic information. Only display author created root message content,  even this topic already
@@ -656,7 +654,7 @@
 			request.setAttribute(ForumConstants.AUTHORING_TOPIC,topic);
     	}
 		
-    	return ajaxExecute(mapping.findForward("success"),null,request,response);
+    	return mapping.findForward("success");
     	
     }
     /**
@@ -688,7 +686,7 @@
 					UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 					Long topicAuthorId = topic.getMessage().getCreatedBy().getUserId();
 					if(!(new Long(user.getUserID().intValue()).equals(topicAuthorId)))
-						return ajaxExecute(mapping.findForward("forbiden"),null,request,response);
+						return mapping.findForward("forbiden");
 				}
 				//update message to HTML Form to echo back to web page: for subject, body display
 				msgForm.setMessage(topic.getMessage());
@@ -698,7 +696,7 @@
     	}
 		
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
-    	return ajaxExecute(mapping.findForward("success"),form,request,response);
+    	return mapping.findForward("success");
     }
     
     /**
@@ -746,7 +744,7 @@
 		
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
 		request.setAttribute(ForumConstants.SUCCESS_FLAG,"EDIT_SUCCESS");
-    	return ajaxExecute(mapping.findForward("success"),null,request,response);
+		return mapping.findForward("success");
     }
     /**
      * Delete a topic's attachment file. This update will be submit to database only when user
@@ -798,7 +796,7 @@
 
     	String mode = (String) request.getSession().getAttribute(ForumConstants.MODE);
     	if(StringUtils.equals(mode,ForumConstants.AUTHOR_MODE))
-    		return ajaxExecute(mapping.findForward("author"),null,request,response);
+    		return mapping.findForward("author");
     	else
     		return mapping.findForward("monitor");
     	
@@ -886,38 +884,5 @@
 		}
 		return list;
 	}
-	
-	/**
-	 * @param request
-	 * @param response
-	 * @param path
-	 * 		The relative URL path infomation to response
-	 */
-	private ActionForward ajaxExecute(ActionForward forward, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		if(form != null)
-			request.setAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY,form);
-		
-		//MutlipartRequestWrapper is special for STRUTS, get back the original HttpServletRequest
-		// to avoid exception in dispatcher.forward() method.
-		if(request instanceof MultipartRequestWrapper){
-			request = ((MultipartRequestWrapper) request).getRequest();
-		}
-		try {
-			if (forward != null) {
-				return forward;
-//				String path = forward.getPath();
-//				RequestDispatcher dispatcher = request.getRequestDispatcher(path);
-//				dispatcher.forward(request, response);
-			} else {
-				OutputStream out = response.getOutputStream();
-				out.write(new byte[0]);
-				out.flush();
-			}
-		} catch (IOException e) {
-			log.error(e);
-		}
-		//it always return null
-		return null;
-	}
+
 }
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r01901ddf0401e83d85086b01e71fd7101b1017cc -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 01901ddf0401e83d85086b01e71fd7101b1017cc)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -126,8 +126,8 @@
 		</action>
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			input="tiles:/authoring/forum/viewTopic" 
 			parameter="deleteTopic">
+			<forward name="success" path="/jsps/authoring/message/delete.jsp" />
 		</action>
 		<action path="/authoring/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -2,7 +2,7 @@
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 <html>
 <tiles:insert attribute="header" />
-<body>
+<body >
 
 	<tiles:useAttribute name="pageTitleKey" scope="request" />
 	<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r01901ddf0401e83d85086b01e71fd7101b1017cc -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 01901ddf0401e83d85086b01e71fd7101b1017cc)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -8,13 +8,15 @@
 	function showMessage(url) {
 		var area=document.getElementById("messageArea");
 		area.style.width="100%";
-		area.style.height="500px";
+		area.style.height="100%";
 		area.src=url;
+		area.style.display="block";
 	}
 	function hideMessage(){
 		var area=document.getElementById("messageArea");
 		area.style.width="0px";
 		area.style.height="0px";
+		area.style.display="none";
 	}
 </script>
 <!---------------------------Basic Tab Content ------------------------>
@@ -66,7 +68,8 @@
 	</tr>
 		<tr>
 	<td colspan="2">
-		<iframe id="messageArea" name="messageArea" style="width:0px;height:0px;border:0px" scrolling="no">
+		<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
+		id="messageArea" name="messageArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no"  scrolling="no">
 		</iframe>
 	</td>
 	</tr>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r01901ddf0401e83d85086b01e71fd7101b1017cc -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 01901ddf0401e83d85086b01e71fd7101b1017cc)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -15,8 +15,7 @@
 
 <html:errors property="error" />
 <div align="center">
-<html:form action="/authoring/createTopic.do" focus="message.subject"
-	onsubmit="return validateMessageForm(this);"  enctype="multipart/form-data">
+<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data">
 	<fieldset>
 		<%@ include file="/jsps/message/topicform.jsp" %>
 	 </fieldset>
Index: lams_tool_forum/web/jsps/authoring/message/delete.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/message/delete.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/message/delete.jsp	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -0,0 +1,15 @@
+<%@ include file="/includes/taglibs.jsp" %>
+
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
+<script type="text/javascript">
+	function success(){
+		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
+		if(flag == "DELETE_SUCCESS"){
+			var d = new Date()
+			var t = d.getTime()
+			loadDoc("<html:rewrite page='/authoring/refreshTopic.do'/>"+"?="+escape(t),window.parent.document.getElementById("messageListArea"));
+			window.parent.hideMessage();
+		}
+	}
+	success();
+</script>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -rf6d33f29edef65c40875e3093a7537761cec3d6e -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision f6d33f29edef65c40875e3093a7537761cec3d6e)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -1,18 +1,11 @@
 <%@ 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 == "ATT_SUCCESS_FLAG"){
-			window.opener.parent.location.href = "<html:rewrite page='/authoring/finishTopic.do'/>";
-		}
-	}
-	success();
-</script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
+
+
 <html:errors property="error" />
 <div align="center">
 <html:form action="/authoring/updateTopic.do" focus="message.subject"
-	onsubmit="return validateMessageForm(this);"  enctype="multipart/form-data">
+	 enctype="multipart/form-data">
 	<fieldset>
 		<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
 		<%@ include file="/jsps/message/topiceditform.jsp" %>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -r01901ddf0401e83d85086b01e71fd7101b1017cc -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 01901ddf0401e83d85086b01e71fd7101b1017cc)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -1,4 +1,19 @@
 <%@ include file="/includes/taglibs.jsp" %>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
+<script type="text/javascript">
+	function success(){
+		var flag = "<c:out value="${SUCCESS_FLAG}"/>";
+		if(flag == "EDIT_SUCCESS"){
+			var d = new Date()
+			var t = d.getTime()
+			loadDoc("<html:rewrite page='/authoring/refreshTopic.do'/>"+"?="+escape(t),window.parent.document.getElementById("messageListArea"));
+			window.parent.hideMessage();
+		}
+	}
+	success();
+</script>
+
+
 <div align="center">
 <fieldset>
 	<%@ include file="/jsps/message/topicview.jsp" %>
Index: lams_tool_forum/web/jsps/message/topiceditform.jsp
===================================================================
diff -u -rc7bf0e8e34f061741e88531db347d2b357a6da7a -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/jsps/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision c7bf0e8e34f061741e88531db347d2b357a6da7a)
+++ lams_tool_forum/web/jsps/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -46,6 +46,9 @@
 			</html:submit>
 		</td>
 		<td>
+			<html:button property="cancel" onclick="javascript:window.parent.hideMessage()">
+				<bean:message key="button.cancel" />
+			</html:button>
 		</td>
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/message/topicform.jsp
===================================================================
diff -u -r01901ddf0401e83d85086b01e71fd7101b1017cc -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/jsps/message/topicform.jsp	(.../topicform.jsp)	(revision 01901ddf0401e83d85086b01e71fd7101b1017cc)
+++ lams_tool_forum/web/jsps/message/topicform.jsp	(.../topicform.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -21,10 +21,10 @@
 	</tr>
 		<td>&nbsp;&nbsp;
 			<html:submit>
-				<bean:message key="button.submit" />
+				<bean:message key="button.add" />
 			</html:submit>
 			<html:button property="cancel" onclick="javascript:window.parent.hideMessage()">
-				<bean:message key="button.submit" />
+				<bean:message key="button.cancel" />
 			</html:button>
 		</td>
 	</tr>
Index: lams_tool_forum/web/jsps/message/topicview.jsp
===================================================================
diff -u -r01901ddf0401e83d85086b01e71fd7101b1017cc -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86
--- lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 01901ddf0401e83d85086b01e71fd7101b1017cc)
+++ lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
@@ -43,14 +43,17 @@
 				</c:set> 
 				<html:link href="${edittopic}">
 					<b><fmt:message key="label.edit" /></b>
-				</html:link>
+				</html:link>&nbsp;&nbsp;
 				
 				<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>
+					<b><fmt:message key="label.delete" />
+				</html:link> &nbsp;&nbsp;
+				<html:link href="javascript:window.parent.hideMessage()">
+					<fmt:message key="button.cancel" />
+				</html:link></b>
 			</td>
 		</tr>
 	</table>