Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v
diff -u -r1.23 -r1.24
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	14 Dec 2005 03:34:47 -0000	1.23
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	12 Jan 2006 03:52:55 -0000	1.24
@@ -124,6 +124,12 @@
 			<forward name="success" path="/authoring/viewTopic.do" />
 		</action>
 		
+		<action path="/authoring/refreshTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			parameter="refreshTopic" >
+			<forward name="author" path="/jsps/message/topiclist.jsp" />
+			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
+		</action>
 		<action path="/authoring/finishTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			input="tiles:/authoring/forum/create" 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.31 -r1.32
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	15 Dec 2005 03:43:46 -0000	1.31
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	12 Jan 2006 03:52:56 -0000	1.32
@@ -21,6 +21,7 @@
 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;
@@ -44,6 +45,7 @@
 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;
@@ -121,6 +123,9 @@
         if (param.equals("deleteAttachment")) {
         	return deleteAttachment(mapping, form, request, response);
         }
+        if (param.equals("refreshTopic")) {
+        	return refreshTopic(mapping, form, request, response);
+        }
         if (param.equals("finishTopic")) {
        		return finishTopic(mapping, form, request, response);
         }
@@ -219,7 +224,7 @@
 				forumService.createUser(forumUser);
 			}
 			
-			//**********************************Handle Attachement*********************
+			//**********************************Get Forum PO*********************
 			Forum forumPO = forumService.getForumByContentId(forumForm.getToolContentID());
 			if(forumPO == null || !forumForm.getToolContentID().equals(forum.getContentId()) ){
 				//new Forum, create it.
@@ -233,6 +238,7 @@
 			}
 			forumPO.setCreatedBy(forumUser);
 			
+			//**********************************Handle Attachement*********************
 	    	//merge attachment info
 			Set attPOSet = forumPO.getAttachments();
 			if(attPOSet == null)
@@ -650,7 +656,7 @@
 			request.setAttribute(ForumConstants.AUTHORING_TOPIC,topic);
     	}
 		
-    	return mapping.findForward("success");
+    	return ajaxExecute(mapping.findForward("success"),null,request,response);
     	
     }
     /**
@@ -682,7 +688,7 @@
 					UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 					Long topicAuthorId = topic.getMessage().getCreatedBy().getUserId();
 					if(!(new Long(user.getUserID().intValue()).equals(topicAuthorId)))
-						return mapping.findForward("forbiden");
+						return ajaxExecute(mapping.findForward("forbiden"),null,request,response);
 				}
 				//update message to HTML Form to echo back to web page: for subject, body display
 				msgForm.setMessage(topic.getMessage());
@@ -692,7 +698,7 @@
     	}
 		
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
-    	return mapping.findForward("success");
+    	return ajaxExecute(mapping.findForward("success"),form,request,response);
     }
     
     /**
@@ -740,7 +746,7 @@
 		
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
 		request.setAttribute(ForumConstants.SUCCESS_FLAG,"EDIT_SUCCESS");
-		return mapping.findForward("success");
+    	return ajaxExecute(mapping.findForward("success"),null,request,response);
     }
     /**
      * Delete a topic's attachment file. This update will be submit to database only when user
@@ -787,6 +793,17 @@
     	return mapping.findForward("success");
     }
     
+    public ActionForward refreshTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    		HttpServletResponse response) throws PersistenceException {
+
+    	String mode = (String) request.getSession().getAttribute(ForumConstants.MODE);
+    	if(StringUtils.equals(mode,ForumConstants.AUTHOR_MODE))
+    		return ajaxExecute(mapping.findForward("author"),null,request,response);
+    	else
+    		return mapping.findForward("monitor");
+    	
+    }
+    
     public ActionForward finishTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
     	List topics = getTopicList(request);
@@ -869,4 +886,38 @@
 		}
 		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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.28 -r1.29
--- lams_tool_forum/web/WEB-INF/struts-config.xml	14 Dec 2005 03:34:48 -0000	1.28
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	12 Jan 2006 03:52:56 -0000	1.29
@@ -163,6 +163,12 @@
 			scope="session">
 			<forward name="success" path="/authoring/viewTopic.do" />
 		</action>
+		<action path="/authoring/refreshTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			parameter="refreshTopic" >
+			<forward name="author" path="/jsps/message/topiclist.jsp" />
+			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
+		</action>
 		<action path="/authoring/finishTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			input="tiles:/authoring/forum/create" 
Index: lams_tool_forum/web/includes/javascript/xmlrequest.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/javascript/Attic/xmlrequest.js,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/includes/javascript/xmlrequest.js	20 Oct 2005 04:21:51 -0000	1.1
+++ lams_tool_forum/web/includes/javascript/xmlrequest.js	12 Jan 2006 03:52:55 -0000	1.2
@@ -35,7 +35,12 @@
     if (req.readyState == 4) {
         // only if "OK"
         if (req.status == 200) {
-			var select = document.getElementById(target);
+	        var select;
+        	if(typeof target.id != "undefined")
+        		select = target;
+        	else
+				select = document.getElementById(target);
+				
 			select.innerHTML = req.responseText;
          } else {
             alert("There was a problem retrieving the XML data:\n" +
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/web/jsps/authoring/basic.jsp	14 Dec 2005 03:35:27 -0000	1.9
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	12 Jan 2006 03:52:56 -0000	1.10
@@ -5,19 +5,17 @@
 	/**
 	 * Launches the popup window for the instruction files
 	 */
-	function launchPopup(url) {
-		var instructionsWindow = null;
-// add the mac test back in when we have the platform detection working.
-//		if(mac){
-//			window.open(url,'instructions','resizable,width=796,height=570,scrollbars');
-//		}else{
-			if(instructionsWindow && instructionsWindow.open && !instructionsWindow.closed){
-				instructionsWindow.close();
-			}
-			instructionsWindow = window.open(url,'newtopic','resizable,width=796,height=570,scrollbars');
-			instructionsWindow.window.focus();
-//		}	
+	function showMessage(url) {
+		var area=document.getElementById("messageArea");
+		area.style.width="100%";
+		area.style.height="500px";
+		area.src=url;
 	}
+	function hideMessage(){
+		var area=document.getElementById("messageArea");
+		area.style.width="0px";
+		area.style.height="0px";
+	}
 </script>
 <!---------------------------Basic Tab Content ------------------------>
 
@@ -38,32 +36,40 @@
 	</tr>
 	<!-- Topics List Row -->
 	<tr>
-		<td colspan="2" class="formcontrol"><c:if test="${!empty topicList}">
-			<%@ include file="/jsps/message/topiclist.jsp" %>
-		</c:if></td>
+		<td colspan="2" class="formlabel">
+		<div id="messageListArea"></div>
+		</td>
 	</tr>
 	<td colspan="2" align="left">
-			<a href="javascript:launchPopup('<html:rewrite page="/authoring/newTopic.do"/>');">
+			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do"/>');">
 				<fmt:message key="label.authoring.create.new.topic" />
 			</a>
 		</td>
 	</tr>
 	<tr>
 		<td colspan="2"><html:errors /></td>
 	</tr>
+	<tr>
+	<td colspan="2">
+	<!-- Button Row -->
+	<HR>
+	<p align="right">
+		<html:submit property="save" styleClass="a.button">
+			<fmt:message key="label.authoring.save.button" />
+		</html:submit>
+		<html:button property="cancel"
+			onclick="window.close()" styleClass="a.button">
+			<fmt:message key="label.authoring.cancel.button" />
+		</html:button>
+	</p>
+	</td>
+	</tr>
+		<tr>
+	<td colspan="2">
+		<iframe id="messageArea" name="messageArea" style="width:0px;height:0px;border:0px" scrolling="no">
+		</iframe>
+	</td>
+	</tr>
 	</table>
 
-		<!-- Button Row -->
-		<HR>
-		<p align="right">
-			<html:submit property="save" styleClass="a.button">
-				<fmt:message key="label.authoring.save.button" />
-			</html:submit>
-			<html:button property="cancel"
-				onclick="window.close()" styleClass="a.button">
-				<fmt:message key="label.authoring.cancel.button" />
-			</html:button>
-		</p>
-</table>
-
 </div>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	12 Dec 2005 01:19:42 -0000	1.12
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	12 Jan 2006 03:52:55 -0000	1.13
@@ -1,10 +1,13 @@
 <%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+<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 == "CREATE_SUCCESS"){
-			closeWin();
+			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();
@@ -15,8 +18,7 @@
 <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/topicform.jsp" %>
 	 </fieldset>
- </html:form>
+</html:form>
 </div>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/Attic/view.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	1 Nov 2005 06:11:03 -0000	1.2
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	12 Jan 2006 03:52:55 -0000	1.3
@@ -1,14 +1,4 @@
 <%@ 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 == "EDIT_SUCCESS"){
-			window.opener.parent.location.href = "<html:rewrite page='/authoring/finishTopic.do'/>";
-		}
-	}
-	success();
-</script>
 <div align="center">
 <fieldset>
 	<%@ include file="/jsps/message/topicview.jsp" %>
Index: lams_tool_forum/web/jsps/message/topicform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/message/Attic/topicform.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/web/jsps/message/topicform.jsp	20 Dec 2005 05:52:05 -0000	1.3
+++ lams_tool_forum/web/jsps/message/topicform.jsp	12 Jan 2006 03:52:56 -0000	1.4
@@ -23,6 +23,9 @@
 			<html:submit>
 				<bean:message key="button.submit" />
 			</html:submit>
+			<html:button property="cancel" onclick="javascript:window.parent.hideMessage()">
+				<bean:message key="button.submit" />
+			</html:button>
 		</td>
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/message/topiclist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/message/Attic/topiclist.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/web/jsps/message/topiclist.jsp	14 Dec 2005 03:34:48 -0000	1.7
+++ lams_tool_forum/web/jsps/message/topiclist.jsp	12 Jan 2006 03:52:56 -0000	1.8
@@ -1,15 +1,5 @@
+<%@ include file="/includes/taglibs.jsp" %>
 <div align="center">
-<script type="text/javascript">
-	function popupable(url,name){
-	if(window.opener != null || (typeof popFobidden != "undefined"))
-		//it is already a popup window, then just load it
-//		location.href=url;
-		launchPopup(url,name);
-	else
-		//it is not in popup window, so pops it up
-		launchPopup(url,name);
-	}
-</script>
 <div id="topiclist">
 	<div id="datatablecontainer">
 	<table width="100%" align="CENTER" 	class="form">
@@ -28,7 +18,7 @@
 					<c:set var="viewtopic">
 						<html:rewrite page="/authoring/viewTopic.do?topicIndex=${status.index}&create=${topic.message.created.time}" />
 					</c:set> 
-					<html:link href="javascript:popupable('${viewtopic}','topiclist')">
+					<html:link href="javascript:showMessage('${viewtopic}')">
 						<c:out value="${topic.message.subject}" />
 					</html:link>
 				</td>
Index: lams_tool_forum/web/jsps/message/topicview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/message/Attic/topicview.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/message/topicview.jsp	11 Nov 2005 02:48:23 -0000	1.6
+++ lams_tool_forum/web/jsps/message/topicview.jsp	12 Jan 2006 03:52:56 -0000	1.7
@@ -1,14 +1,4 @@
 <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 == "DELETE_SUCCESS"){
-			closeWin();
-		}
-	}
-	success();
-</script>
 
 <div id="topicview">
 	<div id="datatablecontainer">