Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r27d386f3472e12afab03d53dfde3ed9b1c9a44d3 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 27d386f3472e12afab03d53dfde3ed9b1c9a44d3)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -2,7 +2,7 @@
 		<action path="/defineLater"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="defineLater">
 			<forward name="forbidden" path="tiles:/monitoring/forum/defineLaterForbidden" />
@@ -13,7 +13,7 @@
 		<action path="/authoring"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="tiles:/authoring/forum/main" />
@@ -22,7 +22,7 @@
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			parameter="updateContent" 
 			validate="false">
 			<forward name="author" path="tiles:/authoring/forum/main" />
@@ -32,7 +32,7 @@
 		<action path="/authoring/uploadOnline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			parameter="uploadOnlineFile" 
 			validate="false">
 			<forward name="success" path="tiles:/authoring/forum/main" />
@@ -41,7 +41,7 @@
 		<action path="/authoring/uploadOffline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="uploadOfflineFile" >
 			<forward name="success" path="tiles:/authoring/forum/main" />
@@ -50,23 +50,27 @@
 		<action path="/authoring/deleteOnline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="deleteOnlineFile" >
-			<forward name="success" path="tiles:/authoring/forum/main" />
+			<forward name="success" path="/jsps/authoring/parts/onlinefilelist.jsp" />
 		</action>
 		
 		<action path="/authoring/deleteOffline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="deleteOfflineFile" >
-			<forward name="success" path="tiles:/authoring/forum/main" />
+			<forward name="success" path="/jsps/authoring/parts/offlinefilelist.jsp" />
 		</action>
-						
+		
+		<!--  ================= topics  =================  -->	
 		<action path="/authoring/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="messageForm" 
+			validate="false"
+			scope="request"
 			parameter="newTopic">
 			<forward name="success" path="/jsps/authoring/message/create.jsp" />
 		</action>
@@ -78,13 +82,13 @@
 			input="/jsps/authoring/message/create.jsp" 
 			parameter="createTopic"
 			scope="request">
-			<forward name="success" path="/jsps/authoring/message/create.jsp" />
+			<forward name="success" path="/jsps/authoring/message/topiclist.jsp" />
 		</action>
 		
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			parameter="deleteTopic">
-			<forward name="success" path="/jsps/authoring/message/delete.jsp" />
+			<forward name="success" path="/jsps/authoring/message/topiclist.jsp" />
 		</action>
 		
 		<action path="/authoring/viewTopic"
@@ -101,18 +105,15 @@
 			name="messageForm" 
 			validate="false"
 			parameter="editTopic"
-			scope="session">
+			scope="request">
 			<forward name="success" path="/jsps/authoring/message/edit.jsp" />
 			<forward name="forbidden" path="/jsps/authoring/message/forbiddenedit.jsp" />
 		</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="/jsps/authoring/message/edit.jsp" />
+			parameter="deleteAttachment">
+			<forward name="success" path="/jsps/authoring/parts/msgattachment.jsp" />
 		</action>
 		
 		<action path="/authoring/updateTopic"
@@ -121,25 +122,11 @@
 			validate="true"
 			input="/jsps/authoring/message/edit.jsp" 
 			parameter="updateTopic"
-			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" >
+			scope="request">
 			<forward name="success" path="/jsps/authoring/message/topiclist.jsp" />
 		</action>
-		<action path="/authoring/finishTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			input="tiles:/authoring/forum/create" 
-			name="forumForm" 
-			scope="session" 
-			validate="false"
-			parameter="finishTopic" >
-			<forward name="author" path="tiles:/authoring/forum/main" />
-			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
-		</action>
+
+
 		
 		<!-- ========== END: Authroing Definitions ============================== -->
 		
@@ -192,7 +179,7 @@
 			name="messageForm" 
 			validate="false" 
 			parameter="editTopic" 
-			scope="session">
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
 		<action path="/learning/updateTopic"
@@ -201,21 +188,21 @@
 			validate="true" 
 			input="tiles:/learning/forum/editTopic"
 			parameter="updateTopic" 
-			scope="session">
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>
 		<action path="/learning/updateMessageHideFlag"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			parameter="updateMessageHideFlag" 
-			scope="session">
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>	
 		<action path="/learning/deleteAttachment"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			name="messageForm" 
 			validate="false"
 			parameter="deleteAttachment"
-			scope="session">
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
 				
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r27d386f3472e12afab03d53dfde3ed9b1c9a44d3 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 27d386f3472e12afab03d53dfde3ed9b1c9a44d3)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -48,7 +48,6 @@
 	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";
 	public static final String FORUM_ID = "forum_id";
 
 	public static final int SESSION_STATUS_FINISHED = 1;
@@ -95,7 +94,9 @@
 
 	public static final String ATTR_NO_MORE_POSTS = "noMorePosts";
 
+	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
 
+
 	
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java	(.../ForumWebUtils.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java	(.../ForumWebUtils.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -24,8 +24,13 @@
 /* $$Id$$ */	
 package org.lamsfoundation.lams.tool.forum.util;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumException;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /**
@@ -49,5 +54,23 @@
         else //  (content.isContentInUse()==true && content.isDefineLater() == false)
             return false;
 	}
+
+	/**
+	 * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
+	 * @param request
+	 * @return
+	 */
+	public static ToolAccessMode getAccessMode(HttpServletRequest request) {
+		ToolAccessMode mode = null;
+		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+		if(StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.TEACHER.toString()))
+			mode = ToolAccessMode.TEACHER;
+		else if (StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.AUTHOR.toString()))
+			mode = ToolAccessMode.AUTHOR;
+		else if (StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.LEARNER.toString()))
+			mode = ToolAccessMode.LEARNER;
+		
+		return mode;
+	}
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r8538ea9651f478bd2973da6eda56176902fa92d7 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8538ea9651f478bd2973da6eda56176902fa92d7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -26,7 +26,6 @@
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
@@ -45,7 +44,6 @@
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -72,6 +70,7 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -89,14 +88,14 @@
 		String param = mapping.getParameter();
 		//-----------------------Forum Author function ---------------------------
 	  	if (param.equals("initPage")) {
-	  		request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR);
+	  		request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR);
        		return initPage(mapping, form, request, response);
         }
 
 		// ***************** Monitoring define later screen ********************
 		if (param.equals("defineLater")){
 			//update define later flag to true
-			request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER);
+			request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER);
 			forumService = getForumManager();
 			Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 			Forum forum = forumService.getForumByContentId(contentId);
@@ -151,12 +150,6 @@
         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);
-        }
         return mapping.findForward("error");
 	}
 	//******************************************************************************************************************
@@ -174,10 +167,14 @@
 	 */
 	protected ActionForward initPage(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-
-		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
+		//initial Session Map 
+		SessionMap sessionMap = new SessionMap();
+		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+		
 		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		ForumForm forumForm = (ForumForm)form;
+		forumForm.setSessionMapID(sessionMap.getSessionID());
+		
 		//get back the topic list and display them on page
 		forumService = getForumManager();
 
@@ -203,7 +200,7 @@
 				topics = forumService.getAuthoredTopics(forum.getUid());
 			}
 			//initialize attachmentList
-			List attachmentList = getAttachmentList(request);
+			List attachmentList = getAttachmentList(sessionMap);
 			attachmentList.addAll(forum.getAttachments());
 
 			//tear down PO to normal object using clone() method
@@ -217,7 +214,8 @@
 		//init it to avoid null exception in following handling
 		if(topics == null)
 			topics = new ArrayList();
-		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
+		
+		sessionMap.put(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 		return mapping.findForward("success");
 	}
 	/**
@@ -242,6 +240,7 @@
 		
 		ToolAccessMode mode = getAccessMode(request); 
 		ForumForm forumForm = (ForumForm)(form);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(forumForm.getSessionMapID());
 		//validation
 		ActionMessages errors = validate(forumForm, mapping, request);
 		if(!errors.isEmpty()){
@@ -293,8 +292,8 @@
 			Set attPOSet = forumPO.getAttachments();
 			if(attPOSet == null)
 				attPOSet = new HashSet();
-			List attachmentList = getAttachmentList(request);
-			List deleteAttachmentList = getDeletedAttachmentList(request);
+			List attachmentList = getAttachmentList(sessionMap);
+			List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
 			Iterator iter = attachmentList.iterator();
 			while(iter.hasNext()){
 				Attachment newAtt = (Attachment) iter.next();
@@ -330,7 +329,7 @@
 			
 			//********************************Handle topic*******************
 			//delete message attachment
-			List topicDeleteAttachmentList = getTopicDeletedAttachmentList(request);
+			List topicDeleteAttachmentList = getTopicDeletedAttachmentList(sessionMap);
 			iter = topicDeleteAttachmentList.iterator();
 			while(iter.hasNext()){
 				Attachment delAtt = (Attachment) iter.next();
@@ -340,7 +339,7 @@
 			}
 			
 			//Handle message
-			List topics = getTopicList(request);
+			List topics = getTopicList(sessionMap);
 	    	iter = topics.iterator();
 	    	while(iter.hasNext()){
 	    		MessageDTO dto = (MessageDTO) iter.next();
@@ -352,7 +351,7 @@
 	    		}
 	    	}
 	    	//delete them from database.
-	    	List delTopics = getDeletedTopicList(request);
+	    	List delTopics = getDeletedTopicList(sessionMap);
 	    	iter = delTopics.iterator();
 	    	while(iter.hasNext()){
 	    		MessageDTO dto = (MessageDTO) iter.next();
@@ -362,7 +361,7 @@
 	    	}
 
 			//initialize attachmentList again
-			attachmentList = getAttachmentList(request);
+			attachmentList = getAttachmentList(sessionMap);
 			attachmentList.addAll(forum.getAttachments());
 		} catch (Exception e) {
 			log.error(e);
@@ -412,6 +411,7 @@
 			String type,HttpServletRequest request) {
 
 		ForumForm forumForm = (ForumForm) form;
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(forumForm.getSessionMapID());
 		
 		FormFile file;
 		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type))
@@ -424,8 +424,8 @@
 		Attachment att = forumService.uploadInstructionFile(file, type);
 		
 		//handle session value
-		List attachmentList = getAttachmentList(request);
-		List deleteAttachmentList = getDeletedAttachmentList(request);
+		List attachmentList = getAttachmentList(sessionMap);
+		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
 		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
 		Iterator iter = attachmentList.iterator();
 		Attachment existAtt;
@@ -442,21 +442,18 @@
 		attachmentList.add(att);
 		
 		//update Html FORM, this will echo back to web page for display
-		List list;
-		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
-			list = forumForm.getOfflineFileList();
-			if(list == null){
-				list = new ArrayList();
-				forumForm.setOfflineFileList(list);
-			}
-		}else{
-			list = forumForm.getOnlineFileList();
-			if(list == null){
-				list = new ArrayList();
-				forumForm.setOnlineFileList(list);
-			}
+		List onlineFileList = new ArrayList();
+		List offlineFileList = new ArrayList();
+		iter = attachmentList.iterator();
+		while(iter.hasNext()){
+			Attachment attFile = (Attachment) iter.next();
+			if(StringUtils.equalsIgnoreCase(attFile.getFileType(),IToolContentHandler.TYPE_OFFLINE))
+				offlineFileList.add(attFile);
+			else
+				onlineFileList.add(attFile);
 		}
-		list.add(att);
+		forumForm.setOnlineFileList(onlineFileList);
+		forumForm.setOfflineFileList(offlineFileList);
 		
 		return mapping.findForward("success");
 
@@ -473,7 +470,7 @@
 	 */
 	public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(request, response,form, IToolContentHandler.TYPE_OFFLINE);
+		return deleteFile(mapping, form,request, response, IToolContentHandler.TYPE_OFFLINE);
 	}
 	/**
 	 * Delete online instruction file from current Forum authoring page.
@@ -485,7 +482,7 @@
 	 */
 	public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(request, response,form, IToolContentHandler.TYPE_ONLINE);
+		return deleteFile(mapping, form,request, response, IToolContentHandler.TYPE_ONLINE);
 	}
 
 	/**
@@ -495,91 +492,38 @@
 	 * @param type 
 	 * @return
 	 */
-	private ActionForward deleteFile(HttpServletRequest request, HttpServletResponse response, ActionForm form, String type) {
-		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+	private ActionForward deleteFile(ActionMapping mapping,ActionForm form,HttpServletRequest request, HttpServletResponse response, String type){
 		Long versionID = new Long(WebUtil.readLongParam(request,"versionID"));
 		Long uuID = new Long(WebUtil.readLongParam(request,"uuID"));
+		//get sessionMAP
+		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		
 		//handle session value
-		List attachmentList = getAttachmentList(request);
-		List deleteAttachmentList = getDeletedAttachmentList(request);
+		List attachmentList = getAttachmentList(sessionMap);
+		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
 		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
 		Iterator iter = attachmentList.iterator();
 		Attachment existAtt;
+		List leftAttachments = new ArrayList();
 		while(iter.hasNext()){
 			existAtt = (Attachment) iter.next();
 			if(existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
-				break;
+			}else if(StringUtils.equals(existAtt.getFileType(),type) ){
+				leftAttachments.add(existAtt);
 			}
+				
 		}
-		
-		//handle web page display
-		List leftAttachments;
+
 		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
-			leftAttachments = ((ForumForm)form).getOfflineFileList();
+			request.setAttribute("offlineFileList",leftAttachments);
 		}else{
-			leftAttachments = ((ForumForm)form).getOnlineFileList();
+			request.setAttribute("onlineFileList",leftAttachments);
 		}
-		iter = leftAttachments.iterator();
-		while(iter.hasNext()){
-			Attachment att = (Attachment) iter.next();
-			if(versionID.equals(att.getFileVersionId()) && uuID.equals(att.getFileUuid())){
-				iter.remove();
-				break;
-			}
-		}
-		StringBuffer sb = new StringBuffer();
-		iter = leftAttachments.iterator();
-		
-		boolean hasAtts = iter.hasNext();
-		
-		if (hasAtts) {
-			sb.append("<ul>");
-		}		
-		while(iter.hasNext()){
-			Attachment file = (Attachment) iter.next();
-			sb.append("<li>").append(file.getFileName()).append("\r\n");
-			sb.append(" <a href=\"javascript:launchInstructionsPopup('download/?uuid=").append(file.getFileUuid()).append("&preferDownload=false')\">");
-			sb.append(this.getResources(request).getMessage("label.view"));
-			sb.append("</a>\r\n");
-			sb.append(" <a href=\"../download/?uuid=").append(file.getFileUuid()).append("&preferDownload=true\">");
-			sb.append(this.getResources(request).getMessage("label.download"));
-			sb.append("</a>\r\n");
-			sb.append("<a href=\"javascript:loadDoc('");
-			sb.append(ForumConstants.TOOL_URL_BASE);
-			sb.append("deletefile.do?method=");
-			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
-				sb.append("deleteOffline");
-			else
-				sb.append("deleteOnline");
-			sb.append("File&toolContentID=").append(contentID);
-			sb.append("&uuID=").append(file.getFileUuid()).append("&versionID=").append(file.getFileVersionId()).append("','");
-			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
-				sb.append("offlinefile");
-			else
-				sb.append("onlinefile");
-			sb.append("')\">");
-			
-			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
-				sb.append(this.getResources(request).getMessage("label.authoring.offline.delete"));
-			else
-				sb.append(this.getResources(request).getMessage("label.authoring.online.delete"));
-			sb.append("</a></li>\r\n");
-		}
-		if (hasAtts) {
-			sb.append("<ul>");
-		}		
-		try {
-			PrintWriter out = response.getWriter();
-			out.print(sb.toString());
-			out.flush();
-		} catch (IOException e) {
-			log.error(e);
-		}
-		return null;
+		return mapping.findForward("success");
 	}
 	
 	//******************************************************************************************************************
@@ -597,6 +541,8 @@
 	 */
 	private ActionForward newTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID );
+		((MessageForm)form).setSessionMapID(sessionMapID);
 		
 		return mapping.findForward("success");
 	}
@@ -614,15 +560,17 @@
 	 */
 	public ActionForward createTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws IOException, ServletException, PersistenceException {
+		MessageForm messageForm = (MessageForm) form;
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
 		
-		List topics = getTopicList(request);
+		List topics = getTopicList(sessionMap);
 		//get login user (author)
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 		
 		//get message info from web page
-		MessageForm messageForm = (MessageForm) form;
 		Message message = messageForm.getMessage();
 		//init some basic variables for first time create
 		message.setIsAuthored(true);
@@ -655,34 +603,7 @@
 		//save the new message into HttpSession
 		topics.add(0,MessageDTO.getMessageDTO(message));
 		
-		//echo back to web page
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"CREATE_SUCCESS");
-		return mapping.findForward("success");
-	}
-	/**
-	 * Delete a topic form current topic list. But database record will be deleted only when user save whole authoring 
-	 * page. 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws PersistenceException
-	 */
-    public ActionForward deleteTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-    	
-    	List topics = getTopicList(request);
-		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
-		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
-
-		if(topicIdx != -1){
-			Object obj = topics.remove(topicIdx);
-			List delList = getDeletedTopicList(request);
-			delList.add(obj);
-    	}
 		
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"DELETE_SUCCESS");
 		return mapping.findForward("success");
 	}
     /**
@@ -699,7 +620,12 @@
     public ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
     	
-    	List topics = getTopicList(request);
+    	//get SessionMAP
+		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID );
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+		
+    	List topics = getTopicList(sessionMap);
     	String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
 		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
 		
@@ -719,6 +645,35 @@
     	return mapping.findForward("success");
     	
     }
+	/**
+	 * Delete a topic form current topic list. But database record will be deleted only when user save whole authoring 
+	 * page. 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws PersistenceException
+	 */
+    public ActionForward deleteTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws PersistenceException {
+		//get SessionMAP
+		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID );
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID,sessionMapID);
+    	List topics = getTopicList(sessionMap);
+		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
+		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
+
+		if(topicIdx != -1){
+			Object obj = topics.remove(topicIdx);
+			List delList = getDeletedTopicList(sessionMap);
+			delList.add(obj);
+    	}
+		
+		return mapping.findForward("success");
+	}
+
     /**
      * Display a HTML FORM which contains subject, body and attachment information from a special topic. This page
      * is ready for user update this topic.
@@ -733,8 +688,14 @@
     public ActionForward editTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
     	
-    	MessageForm msgForm = (MessageForm)form;
-    	List topics = getTopicList(request);
+//    	get SessionMAP
+		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID );
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		
+		MessageForm msgForm = (MessageForm)form;
+		msgForm.setSessionMapID(sessionMapID);
+		
+    	List topics = getTopicList(sessionMap);
     	String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
 		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
 		if(topicIdx != -1){
@@ -774,14 +735,17 @@
      */
     public ActionForward updateTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
+    	MessageForm messageForm = (MessageForm) form;
+    	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
+    	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
+    	
     	//get value from HttpSession
-    	List topics = getTopicList(request);
+    	List topics = getTopicList(sessionMap);
 		//get param from HttpServletRequest
 		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
 		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
 		
 		if(topicIdx != -1){
-			MessageForm messageForm = (MessageForm) form;
 			Message message = messageForm.getMessage();
 			
 			MessageDTO newMsg = (MessageDTO) topics.get(topicIdx);
@@ -801,87 +765,29 @@
 				attSet.add(att);
 				newMsg.setHasAttachment(true);
 				newMsg.getMessage().setAttachments(attSet);
+			}else if(!messageForm.isHasAttachment()){
+				newMsg.setHasAttachment(false);
+				newMsg.getMessage().setAttachments(null);
 			}
 		}
 		
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"EDIT_SUCCESS");
 		return mapping.findForward("success");
     }
-    /**
-     * Delete a topic's attachment file. This update will be submit to database only when user
-     * save whole authoring page.
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws PersistenceException
-     */
-    public ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-
-//		get value from HttpSession
-    	List topics = getTopicList(request);
-    	//get param from HttpServletRequest
-		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
-		
-		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
-		
-		if(topicIdx != -1){
-			MessageDTO newMsg = (MessageDTO) topics.get(topicIdx);
-			if(newMsg.getMessage()== null)
-				newMsg.setMessage(new Message());
-			//add delete topic attachment to HTTPSession
-			Set attSet = newMsg.getMessage().getAttachments();
-			if(attSet != null){
-				//only one attachment for topic
-				Attachment att = (Attachment) attSet.iterator().next();
-				if(att != null){
-					List topicDeletedAttachmentList = getTopicDeletedAttachmentList(request);
-					topicDeletedAttachmentList.add(att);
-				}
-			}
-			//set other infor about attachment
-			newMsg.getMessage().setUpdated(new Date());
-			newMsg.setHasAttachment(false);
-			newMsg.getMessage().setAttachments(null);
-		}
-		
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"ATT_SUCCESS_FLAG");
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
+	/**
+	 * Remove message attachment.
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		request.setAttribute("itemAttachment", null);
     	return mapping.findForward("success");
     }
-    
-    public ActionForward refreshTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-    		HttpServletResponse response) throws PersistenceException {
 
-   		return mapping.findForward("success");
-    	
-    }
-    
-    public ActionForward finishTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-    	List topics = getTopicList(request);
-    	
-    	ForumForm forumForm = (ForumForm)form;
-    	Forum forum = forumForm.getForum();
-    	Set msgSet = new HashSet();
-		Iterator iter = topics.iterator();
-		while(iter.hasNext()){
-			MessageDTO dto = (MessageDTO) iter.next();
-			msgSet.add(dto.getMessage());
-		}
-    	forum.setMessages(msgSet);
-    	
-    	ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
-    	if(mode.isAuthor())
-    		return mapping.findForward("author");
-    	else
-    		return mapping.findForward("monitor");
-    	
-    }
-
 	//******************************************************************************************************************
 	//              Private method for internal functions
 	//******************************************************************************************************************
@@ -896,36 +802,36 @@
 	 * @param request
 	 * @return
 	 */
-	private List getAttachmentList(HttpServletRequest request) {
-		return getListFromSession(request,ForumConstants.ATTACHMENT_LIST);
+	private List getAttachmentList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ForumConstants.ATTACHMENT_LIST);
 	}
 	/**
 	 * @param request
 	 * @return
 	 */
-	private List getDeletedAttachmentList(HttpServletRequest request) {
-		return getListFromSession(request,ForumConstants.DELETED_ATTACHMENT_LIST);
+	private List getDeletedAttachmentList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ForumConstants.DELETED_ATTACHMENT_LIST);
 	}
 	/**
 	 * @param request
 	 * @return
 	 */
-	private List getTopicList(HttpServletRequest request) {
-		return getListFromSession(request,ForumConstants.AUTHORING_TOPICS_LIST);
+	private List getTopicList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ForumConstants.AUTHORING_TOPICS_LIST);
 	}
 	/**
 	 * @param request
 	 * @return
 	 */
-	private List getTopicDeletedAttachmentList(HttpServletRequest request) {
-		return getListFromSession(request,ForumConstants.DELETED_ATTACHMENT_LIST);
+	private List getTopicDeletedAttachmentList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ForumConstants.DELETED_ATTACHMENT_LIST);
 	}
 	/**
 	 * @param request
 	 * @return
 	 */
-	private List getDeletedTopicList(HttpServletRequest request) {
-		return getListFromSession(request,ForumConstants.DELETED_AUTHORING_TOPICS_LIST);
+	private List getDeletedTopicList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ForumConstants.DELETED_AUTHORING_TOPICS_LIST);
 	}
 	/**
 	 * Get <code>java.util.List</code> from HttpSession by given name.
@@ -934,14 +840,15 @@
 	 * @param name
 	 * @return
 	 */
-	private List getListFromSession(HttpServletRequest request,String name) {
-		List list = (List) request.getSession().getAttribute(name);
+	private List getListFromSession(SessionMap sessionMap,String name) {
+		List list = (List) sessionMap.get(name);
 		if(list == null){
 			list = new ArrayList();
-			request.getSession().setAttribute(name,list);
+			sessionMap.put(name,list);
 		}
 		return list;
 	}
+	
 	/**
 	 * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
 	 * @param request
@@ -964,14 +871,15 @@
     public ActionMessages validate( ForumForm form,ActionMapping mapping, javax.servlet.http.HttpServletRequest request) {
     	ActionMessages errors = new ActionMessages();
     	
+    	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(form.getSessionMapID());
 		ActionMessage ae;
 		try {
 			if (StringUtils.isBlank(form.getForum().getTitle())) {
 				ActionMessage error = new ActionMessage("error.title.empty");
 				errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 			}
 			if(!form.getForum().isAllowNewTopic()){
-				List topics = getTopicList(request);
+				List topics = getTopicList(sessionMap);
 				if(topics.size() == 0){
 					ActionMessage error = new ActionMessage("error.must.have.topic");
 					errors.add(ActionMessages.GLOBAL_MESSAGE, error);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java
===================================================================
diff -u -r6f0b2f51a5dd4135371017fd19a2292c35220689 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 6f0b2f51a5dd4135371017fd19a2292c35220689)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -28,8 +28,6 @@
 
 import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * This class give a chance to clear HttpSession when user save/close authoring page.
@@ -42,12 +40,7 @@
 	@Override
 	public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode) {
 		if(mode.isAuthor()){
-			session.removeAttribute(AttributeNames.ATTR_MODE);
-			session.removeAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
-			session.removeAttribute(ForumConstants.ATTACHMENT_LIST);
-			session.removeAttribute(ForumConstants.DELETED_ATTACHMENT_LIST);
-			session.removeAttribute(ForumConstants.DELETED_ATTACHMENT_LIST);
-			session.removeAttribute(ForumConstants.DELETED_AUTHORING_TOPICS_LIST);
+			session.removeAttribute(customiseSessionID);
 		}
 	}
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java
===================================================================
diff -u -rb56d90d0894b861844b15ebdb81a6587e7933e63 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision b56d90d0894b861844b15ebdb81a6587e7933e63)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -62,6 +62,8 @@
 	//Forum fields
 	private Long toolContentID;
 	private String currentTab;
+	private String sessionMapID;
+	
     private FormFile offlineFile;
     private FormFile onlineFile;
     private List onlineFileList;
@@ -168,5 +170,11 @@
 	public void setOnlineFileList(List onlineFileList) {
 		this.onlineFileList = onlineFileList;
 	}
+	public String getSessionMapID() {
+		return sessionMapID;
+	}
+	public void setSessionMapID(String sessionMapID) {
+		this.sessionMapID = sessionMapID;
+	}
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -r427a3b63491fb2f3206a785705ac247af49e1360 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -32,6 +32,7 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.upload.FormFile;
 import org.apache.struts.validator.ValidatorForm;
+import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 
 /**
@@ -48,10 +49,12 @@
 	private static Logger logger = Logger.getLogger(ForumForm.class.getName());
 	
     protected Message message;
+    protected String sessionMapID;
     protected Long forumId;
     protected Long parentId;
     protected Long topicId;
     
+    private boolean hasAttachment;
     //attachment file name
     private String attachmentName;
     //Message attachment file
@@ -85,6 +88,16 @@
     //-------------------------get/set methods----------------
     public void setMessage(Message message) {
     	this.message = message;
+    	if(message != null){
+    		if(message.getAttachments() != null
+    				&& message.getAttachments().size() > 0){
+    			hasAttachment = true;
+    			attachmentName = ((Attachment)message.getAttachments().iterator().next()).getFileName();
+    		}else{ 
+    			hasAttachment = false;
+    			attachmentName = null;
+    		}
+    	}
     }
 
     public Message getMessage() {
@@ -131,4 +144,16 @@
 	public void setAttachmentFile(FormFile attachmentFile) {
 		this.attachmentFile = attachmentFile;
 	}
+	public String getSessionMapID() {
+		return sessionMapID;
+	}
+	public void setSessionMapID(String sessionMapID) {
+		this.sessionMapID = sessionMapID;
+	}
+	public boolean isHasAttachment() {
+		return hasAttachment;
+	}
+	public void setHasAttachment(boolean hasAttachment) {
+		this.hasAttachment = hasAttachment;
+	}
 }
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r27d386f3472e12afab03d53dfde3ed9b1c9a44d3 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 27d386f3472e12afab03d53dfde3ed9b1c9a44d3)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -52,7 +52,7 @@
 		<action path="/defineLater"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="defineLater">
 			<forward name="forbidden" path="tiles:/monitoring/forum/defineLaterForbidden" />
@@ -62,15 +62,15 @@
 		<action path="/authoring"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			parameter="updateContent" 
 			validate="false">
 			<forward name="author" path="tiles:/authoring/forum/main" />
@@ -80,37 +80,41 @@
 		<action path="/authoring/uploadOnline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			parameter="uploadOnlineFile" 
 			validate="false">
 			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 		<action path="/authoring/uploadOffline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="uploadOfflineFile" >
 			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 		<action path="/authoring/deleteOnline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="deleteOnlineFile" >
-			<forward name="success" path="tiles:/authoring/forum/main" />
+			<forward name="success" path="/jsps/authoring/parts/onlinefilelist.jsp" />
 		</action>
 		<action path="/authoring/deleteOffline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="session" 
+			scope="request" 
 			validate="false"
 			parameter="deleteOfflineFile" >
-			<forward name="success" path="tiles:/authoring/forum/main" />
+			<forward name="success" path="/jsps/authoring/parts/offlinefilelist.jsp" />
 		</action>
+		<!--  ================= topics  =================  -->	
 		<action path="/authoring/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="messageForm" 
+			validate="false"
+			scope="request"
 			parameter="newTopic">
 			<forward name="success" path="/jsps/authoring/message/create.jsp" />
 		</action>
@@ -121,12 +125,12 @@
 			input="/jsps/authoring/message/create.jsp" 
 			parameter="createTopic"
 			scope="request">
-			<forward name="success" path="/jsps/authoring/message/create.jsp" />
+			<forward name="success" path="/jsps/authoring/message/topiclist.jsp" />
 		</action>
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			parameter="deleteTopic">
-			<forward name="success" path="/jsps/authoring/message/delete.jsp" />
+			<forward name="success" path="/jsps/authoring/message/topiclist.jsp" />
 		</action>
 		<action path="/authoring/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
@@ -141,42 +145,25 @@
 			name="messageForm" 
 			validate="false"
 			parameter="editTopic"
-			scope="session">
+			scope="request">
 			<forward name="success" path="/jsps/authoring/message/edit.jsp" />
 			<forward name="forbidden" path="/jsps/authoring/message/forbiddenedit.jsp" />
 		</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="/jsps/authoring/message/edit.jsp" />
+			parameter="deleteAttachment">
+			<forward name="success" path="/jsps/authoring/parts/msgattachment.jsp" />
 		</action>
 		<action path="/authoring/updateTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
 			input="/jsps/authoring/message/edit.jsp" 
 			parameter="updateTopic"
-			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" >
+			scope="request">
 			<forward name="success" path="/jsps/authoring/message/topiclist.jsp" />
 		</action>
-		<action path="/authoring/finishTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
-			input="tiles:/authoring/forum/create" 
-			name="forumForm" 
-			scope="session" 
-			validate="false"
-			parameter="finishTopic" >
-			<forward name="author" path="tiles:/authoring/forum/main" />
-			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
-		</action>
+
 		<!-- ========== END: Authroing Definitions ============================== -->
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/viewForum"
@@ -227,7 +214,7 @@
 			name="messageForm" 
 			validate="false" 
 			parameter="editTopic" 
-			scope="session">
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
 		<action path="/learning/updateTopic"
@@ -236,21 +223,21 @@
 			validate="true" 
 			input="tiles:/learning/forum/editTopic"
 			parameter="updateTopic" 
-			scope="session">
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>
 		<action path="/learning/updateMessageHideFlag"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			parameter="updateMessageHideFlag" 
-			scope="session">
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>	
 		<action path="/learning/deleteAttachment"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			name="messageForm" 
 			validate="false"
 			parameter="deleteAttachment"
-			scope="session">
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
 		<action path="/learning/finish"
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -45,6 +45,7 @@
 <%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
+<%@ attribute name="customiseSessionID" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
@@ -63,14 +64,14 @@
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}'/>";
 	}
     function doSubmit_Form_Only() {
     	document.getElementById("${formID}").submit();
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_forum/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
+++ lams_tool_forum/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -33,16 +33,20 @@
 <%@ tag body-content="empty" %>
 <%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %>
 <%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="redirect" required="false" rtexprvalue="true" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <c:if test="${!empty progress}">
 		<c:set var="randomID">
 			<lams:generateID id="${id}"/>
 		</c:set>
-			<c:set var="passonurl_params" value="?${progress}&lessonID=${id}&uniqueID=${randomID}"/>
-			<c:set var="passonurl_nojs" value="passon.swf${passonurl_params}"/>
-			<c:set var="passonurl_js" value="passon${passonurl_params}"/>
+			<c:set var="passonurl_params" value="${progress}&lessonID=${id}&uniqueID=${randomID}"/>
+			<c:if test="${redirect}">
+				<c:set var="passonurl_params" value="redirect=true&${passonurl_params}"/>
+			</c:if>
 			
+			<c:set var="passonurl_nojs" value="passon.swf?${passonurl_params}"/>
+			<c:set var="passonurl_js" value="passon?${passonurl_params}"/>
 			<script type="text/javascript">
 				AC_FL_RunContent('classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000', 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0','width','1','height','1','align','left','src','<c:out value="${passonurl_js}" escapeXml="false"/>','quality','high','scale','noscale','bgcolor','#FFFFFF','name','passon', 'id', 'passon', 'allowscriptaccess','sameDomain', 'swliveconnect', true, 'type', 'application/x-shockwave-flash', 'pluginspage','http://www.macromedia.com/go/getflashplayer','movie','<c:out value="${passonurl_js}" escapeXml="false"/>' );
 			</script>
Index: lams_tool_forum/web/common/header.jsp
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_forum/web/common/header.jsp	(.../header.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -35,6 +35,5 @@
 <script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/forum.js"></script>
 
-
 <%@ include file="/common/fckeditorheader.jsp"%>
 
Index: lams_tool_forum/web/error.jsp
===================================================================
diff -u -r88acb04987abd12bc87754fbbe1f835dcd99a5cc -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/error.jsp	(.../error.jsp)	(revision 88acb04987abd12bc87754fbbe1f835dcd99a5cc)
+++ lams_tool_forum/web/error.jsp	(.../error.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -54,8 +54,8 @@
 <body>
 <form action="${lams}errorpages/error.jsp" method="post" id="errorForm">
 	<input type="hidden" name="errorName" value="${errorName}"/>
-	<input type="hidden" name="errorMessage" value="${errorMessage}"/>
-	<input type="hidden" name="errorStack" value="${errorStack}"/>
+	<input type="hidden" name="errorMessage" value='${errorMessage}'/>
+	<input type="hidden" name="errorStack" value='${errorStack}'/>
 </form>
 
 <script type="text/javascript">
Index: lams_tool_forum/web/includes/javascript/forum.js
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/includes/javascript/forum.js	(.../forum.js)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/includes/javascript/forum.js	(.../forum.js)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -6,4 +6,13 @@
 		wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
 		wd.window.focus();
 	}
-	
\ No newline at end of file
+	function showBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.show(targetDiv+"_Busy");
+		}
+	}
+	function hideBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.hide(targetDiv+"_Busy");
+		}				
+	}
\ No newline at end of file
Index: lams_tool_forum/web/includes/javascript/message.js
===================================================================
diff -u
--- lams_tool_forum/web/includes/javascript/message.js	(revision 0)
+++ lams_tool_forum/web/includes/javascript/message.js	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -0,0 +1,30 @@
+	/*
+	 This is Resource Item instrcution area.
+	 */
+    var itemAttachmentTargetDiv = "itemAttachmentArea";
+// Please set these 2 variables in JSP file for using tag reason:
+	function removeItemAttachment(idx){
+		//var id = "instructionItem" + idx;
+		//Element.remove(id);
+ 		var url= removeItemAttachmentUrl;
+	    var reqIDVar = new Date();
+	    var param = "reqID="+reqIDVar.getTime();
+	    removeItemAttachmentLoading();
+	    var myAjax = new Ajax.Updater(
+		    	itemAttachmentTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:removeItemAttachmentComplete,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	function removeItemAttachmentLoading(){
+		showBusy(itemAttachmentTargetDiv);
+	}
+	function removeItemAttachmentComplete(){
+		hideBusy(itemAttachmentTargetDiv);
+	}
+
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -rb56d90d0894b861844b15ebdb81a6587e7933e63 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision b56d90d0894b861844b15ebdb81a6587e7933e63)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -2,11 +2,14 @@
 <%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
 
 <html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+	<html:hidden property="toolContentID" />
+	<html:hidden property="sessionMapID" />
+	<html:hidden property="currentTab" styleId="currentTab" />
+	<input type="hidden" name="mode" value="author">
+	
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	<div id="header">
 
-		<html:hidden property="toolContentID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
 
 		<lams:Tabs useKey="true" control="true">
 			<lams:Tab id="1" key="authoring.tab.basic" />
@@ -24,7 +27,9 @@
 			<lams:TabBody id="2" titleKey="authoring.tab.advanced" page="advance.jsp" />
 			<lams:TabBody id="3" titleKey="authoring.tab.instructions" page="instructions.jsp" />
 			<!-- Button Row -->
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" />
-		<lams:HTMLEditor />
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
+				toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" 
+				customiseSessionID="${formBean.sessionMapID}" />
+			<lams:HTMLEditor />
 	</div>
 </html:form>
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -1,4 +1,5 @@
 <%@ include file="/includes/taglibs.jsp"%>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
 <!--  Basic Tab Content -->
 
@@ -25,23 +26,24 @@
 <table >
 	<tr>
 		<td  colspan="2">
-			<lams:SetEditor id="forum.title" text="${forumForm.forum.title}" small="true" key="label.authoring.basic.title" />
+			<lams:SetEditor id="forum.title" text="${formBean.forum.title}" small="true" key="label.authoring.basic.title" />
 		</td>
 	</tr>
 	<tr>
 		<td  colspan="2">
-			<lams:SetEditor id="forum.instructions" text="${forumForm.forum.instructions}" key="label.authoring.basic.instruction"/>
+			<lams:SetEditor id="forum.instructions" text="${formBean.forum.instructions}" key="label.authoring.basic.instruction"/>
 		</td>
 	</tr>
 </table>
 	<!-- Topics List Row -->
 	<div id="messageListArea">
+		<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
 		<%@ include file="/jsps/authoring/message/topiclist.jsp"%>
 	</div>
 <table >
 	<tr>
 		<td colspan="2" align="left">
-			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do"/>');" style="float:left;width:150px"  class="button">
+			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');" style="float:left;width:150px"  class="button">
 				<fmt:message key="label.authoring.create.new.topic" />
 			</a>
 		</td>
Index: lams_tool_forum/web/jsps/authoring/definelater.jsp
===================================================================
diff -u -rb56d90d0894b861844b15ebdb81a6587e7933e63 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision b56d90d0894b861844b15ebdb81a6587e7933e63)
+++ lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -12,7 +12,9 @@
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	<html:hidden property="toolContentID" />
 	<html:hidden property="mode" value="teacher" />
-
+	<html:hidden property="sessionMapID"/>
+	<input type="hidden" name="mode" value="teacher">
+	
 	<div id="header">
 		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
 	</div>
@@ -26,7 +28,9 @@
 		<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
 
 		<!-- Button Row -->
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" accessMode="teacher" defineLater="yes"/>
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
+			toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" 
+			accessMode="teacher" defineLater="yes" customiseSessionID="${formBean.sessionMapID}" />
 		<lams:HTMLEditor />
 	</div>
 </html:form>
Index: lams_tool_forum/web/jsps/authoring/header.jsp
===================================================================
diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/header.jsp	(.../header.jsp)	(revision 6852794f79069c9b70ee194f74677323d0bf14b7)
+++ lams_tool_forum/web/jsps/authoring/header.jsp	(.../header.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -5,6 +5,8 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+
 <script type="text/javascript">
      //<![CDATA[
 	var imgRoot="${lams}images/";
@@ -31,11 +33,9 @@
 		selectTab(tabId);
 	}
 
-	function doSubmit(method, tabId) {
+	function doSubmit(method) {
 		var authorForm = document.getElementById("authoringForm");
-		if(tabId != null)
-			authorForm.currentTab.value=tabId;
-		authorForm.action=method;
+		authorForm.action="<c:url value='/authoring/'/>"+method+".do";
 		authorForm.submit();
 	}
 	
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
diff -u -r9dd6deeaba1a5c8b12dadb8689a7b462f0ced808 -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision 9dd6deeaba1a5c8b12dadb8689a7b462f0ced808)
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -1,119 +1,115 @@
-<%@ include file="/includes/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
-<!--   Instruction Tab Content -->
+<script lang="javascript">
+<!-- Common Javascript functions for LAMS -->
+	var offlineArea = "offlinefileArea";
+	var onlineArea = "onlinefileArea";
+	function deleteOfflineFile(fileUuid,fileVersionId){
+		var url = "<c:url value="/authoring/deleteOffline.do"/>";
+	    var reqIDVar = new Date();
+		var param = "sessionMapID=${formBean.sessionMapID}&uuID=" + fileUuid + "&versionID="+ fileVersionId+"&reqID="+reqIDVar.getTime();
+		offlineLoading();
+	    var myAjax = new Ajax.Updater(
+		    	offlineArea,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:offlineComplete,
+		    		evalScripts:false
+		    	}
+	    );
+	}
+	function deleteOnlineFile(fileUuid,fileVersionId){
+		var url = "<c:url value="/authoring/deleteOnline.do"/>";
+	    var reqIDVar = new Date();
+		var param = "sessionMapID=${formBean.sessionMapID}&uuID=" + fileUuid + "&versionID="+ fileVersionId+"&reqID="+reqIDVar.getTime();
+		onlineLoading();
+	    var myAjax = new Ajax.Updater(
+		    	onlineArea,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:onlineComplete,
+		    		evalScripts:false
+		    	}
+	    );
+	}
 
-<table cellpadding="0">
-	<!-- Instructions Row -->
-	<tr>
-		<td>
-			<lams:SetEditor id="forum.onlineInstructions" small="true" text="${forumForm.forum.onlineInstructions}" key="label.authoring.online.instruction" />
-		</td>
-	</tr>
-
-	<c:if test="${not empty forumForm.onlineFileList}">
+	function offlineLoading(){
+		showBusy(offlineArea);
+	}
+	function offlineComplete(){
+		hideBusy(offlineArea);
+	}
+	function onlineLoading(){
+		showBusy(onlineArea);
+	}
+	function onlineComplete(){
+		hideBusy(onlineArea);
+	}
+</script>
+	<!-- Instruction Tab Content -->
+	<table class="forms">
+		<!--hidden field contentID passed by flash-->
 		<tr>
-			<td>
-				<div id="onlinefile">
-					<ul>
-						<c:forEach var="file" items="${forumForm.onlineFileList}">
-							<li>
-								<c:out value="${file.fileName}" />
-								<c:set var="viewURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
-								</c:set>
-								<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="label.view" /> </a> &nbsp;
-								<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'/>"> <fmt:message key="label.download" /> </a> &nbsp;
-								<c:set var="deleteonline">
-									<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${forumForm.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
-								</c:set>
-								<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
-									<fmt:message key="label.authoring.online.delete" />
-								</html:link>
-							</li>
-						</c:forEach>
-					</ul>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td colspan="2">
+				<lams:SetEditor id="onlineInstruction" small="true" text="${formBean.forum.onlineInstructions}" key="label.authoring.online.instruction" />
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<c:set var="onlineFileList" value="${formBean.onlineFileList}"/>
+				<div id="onlinefileArea">
+					<%@ include file="parts/onlinefilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
-	</c:if>
-	<tr>
-		<td class="field-name">
-			<fmt:message key="label.authoring.online.file" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:file property="onlineFile">
-				<fmt:message key="label.authoring.choosefile.button" />
-			</html:file>
-			<c:set var="uploadonline">
-				<html:rewrite page="/authoring/uploadOnline.do" />
-			</c:set>
-			<a href="#" onclick="doSubmit('${uploadonline}')" class="button"> <fmt:message key="label.authoring.upload.online.button" /> </a>
-		</td>
-	</tr>
-</table>
-
-<hr />
-
-<table>
-	<!-- Offline Instructions -->
-	<tr>
-		<td>
-			<lams:SetEditor id="forum.offlineInstructions" small="true" text="${forumForm.forum.offlineInstructions}" key="label.authoring.offline.instruction" alt="true" />
-		</td>
-	</tr>
-	<c:if test="${not empty forumForm.offlineFileList}">
 		<tr>
+			<td nowrap="nowrap" class="field-name">
+				<fmt:message key="label.authoring.online.file" />:
+			</td>
 			<td>
-				<div id="offlinefile">
-					<ul>
-						<c:forEach var="file" items="${forumForm.offlineFileList}">
-							<li>
-								<c:out value="${file.fileName}" />
-								<c:set var="viewURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
-								</c:set>
-								<html:link href="javascript:launchInstructionsPopup('${viewURL}')">
-									<fmt:message key="label.view" />
-								</html:link>
-								<c:set var="downloadURL">
-									<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
-								</c:set>
-								<html:link href="${downloadURL}">
-									<fmt:message key="label.download" />
-								</html:link>
-								<c:set var="deleteoffline">
-									<html:rewrite page="/authoring/deleteOffline.do?toolContentID=${forumForm.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
-								</c:set>
-								<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
-									<fmt:message key="label.authoring.offline.delete" />
-								</html:link>
-							</li>
-						</c:forEach>
-					</ul>
+				<html:file property="onlineFile">
+					<fmt:message key="label.authoring.choosefile.button" />
+				</html:file>
+				<a href="#" onclick="javascript:doSubmit('uploadOnline');" class="button">
+					<fmt:message key="label.authoring.upload.online.button" />
+				</a>
+			</td>
+		</tr>	
+		<!-- Offline Instructions -->
+		<tr>
+			<td colspan="2">
+			<lams:SetEditor id="offlineInstruction" small="true"  text="${formBean.forum.offlineInstructions}" key="label.authoring.offline.instruction"/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<c:set var="offlineFileList" value="${formBean.offlineFileList}"/>
+				<div id="offlinefileArea">
+					<%@ include file="parts/offlinefilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
-	</c:if>
-
-	<tr>
-		<td class="field-name-alternative-color">
-			<fmt:message key="label.authoring.offline.file" />
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:file property="offlineFile">
-				<fmt:message key="label.authoring.choosefile.button" />
-			</html:file>
-			<c:set var="uploadoffline">
-				<html:rewrite page="/authoring/uploadOffline.do" />
-			</c:set>
-			<a href="#" onclick="doSubmit('${uploadoffline}')" class="button"> <fmt:message key="label.authoring.upload.offline.button" /> </a>
-		</td>
-	</tr>
-</table>
+		<tr>
+			<td nowrap="nowrap" valign="top" class="field-name">
+				<fmt:message key="label.authoring.offline.file" />:
+			</td>
+			<td valign="top">
+				<html:file property="offlineFile">
+					<fmt:message key="label.authoring.choosefile.button" />
+				</html:file>
+				<a href="#" onclick="javascript:doSubmit('uploadOffline');" class="button">
+					<fmt:message key="label.authoring.upload.offline.button" />
+				</a>
+				<p>&nbsp;</p>
+			</td>
+		</tr>			
+		</table>
+		
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -raf3676b09dd96148e87da09c1a2c26c2d101da5b -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision af3676b09dd96148e87da09c1a2c26c2d101da5b)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -2,37 +2,17 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
-		<script type="text/javascript">
-			function success(){
-				var flag = "<c:out value="${SUCCESS_FLAG}"/>";
-				if(flag == "CREATE_SUCCESS"){
-					var d = new Date()
-					var t = d.getTime()
-					loadDoc("<html:rewrite page='/authoring/refreshTopic.do'/>"+"?reqID="+escape(t),window.parent.document.getElementById("messageListArea"));
-					window.parent.hideMessage();
-				}
-			}
-		</script>
-		<style type="text/css">
-		<!--
-		td { 
-			padding:4px; 
-			font-size:12px;
-		}
-		-->
-		</style>
 	</head>
 	<body>
-		<script type="text/javascript">
-			success();
-		</script>
 		<table cellpadding="3">
 			<!-- Basic Info Form-->
 			<%@ include file="/common/messages.jsp"%>
 			<html:form action="/authoring/createTopic.do" focus="message.subject" enctype="multipart/form-data" styleId="topicFormId">
+				<html:hidden property="sessionMapID"/>
 				<tr>
 					<td>
 						<b><bean:message key="message.label.subject" />*</b><BR>
@@ -43,7 +23,6 @@
 				<tr>
 					<td>
 						<b><bean:message key="message.label.body" />*</b><BR>
-						
 						<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 						<fck:editor id="message.body" basePath="/lams/fckeditor/"
 							imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
Fisheye: Tag ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/message/delete.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -raf3676b09dd96148e87da09c1a2c26c2d101da5b -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision af3676b09dd96148e87da09c1a2c26c2d101da5b)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -5,21 +5,20 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
-		<style type="text/css">
-		<!--
-		td { 
-			padding:4px; 
-			font-size:12px;
-		}
-		-->
-		</style>		
+		<script type="text/javascript">
+			var removeItemAttachmentUrl = "<c:url value="/authoring/deleteAttachment.do"/>";
+		</script>
+		
+		<script type="text/javascript" src="${tool}includes/javascript/message.js"></script>
+		
 	</head>
 	<body>
 		<table cellpadding="3">
 			<!-- Basic Info Form-->
 			<%@ include file="/common/messages.jsp"%>
 			<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data" styleId="topicFormId">
 				<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
+				<html:hidden property="sessionMapID"/>
 
 				<tr>
 					<td>
@@ -41,7 +40,7 @@
 							imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
 							linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
 							flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
-							toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
+								toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
 							<c:out value="${formBean.message.body}" escapeXml="false" />
 						</fck:editor>							
 						
@@ -51,23 +50,10 @@
 				<tr>
 					<td>
 						<b><bean:message key="message.label.attachment" /></b>
-						<c:if test="${topic.hasAttachment}">
-							<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;&nbsp;
-								<a href="<c:out value='${deleteURL}'/>" class="button" style="float: none"> <fmt:message key="label.delete" /> </a>
-							</c:forEach>
-						</c:if>
-						<c:if test="${not topic.hasAttachment}">
-							<html:file tabindex="3" property="attachmentFile" />
-						</c:if>
-						<BR>
+						<c:set var="itemAttachment" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+							<div id="itemAttachmentArea">
+								<%@ include file="/jsps/authoring/parts/msgattachment.jsp"%>
+							</div>						
 					</td>
 				</tr>
 				<tr>
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -1,16 +1,17 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp" %>
 <div id="topiclist">
 	<table class="alternative-color">
 		<tr>
 			<th scope="col" width="50%" colspan="2"><fmt:message key="lable.topic.title.subject"/></th>
 			<th scope="col" width="20%" align="center"><fmt:message key="lable.topic.title.startedby"/></th>
 			<th scope="col" width="30%" align="center"><fmt:message key="lable.topic.title.update"/></th>
 		</tr>
-		<c:forEach items="${topicList}" var="topic" varStatus="status">
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+		<c:forEach items="${sessionMap.topicList}" var="topic" varStatus="status">
 			<tr>
 				<td align="left" width="48%">
 					<c:set var="viewtopic">
-						<html:rewrite page="/authoring/viewTopic.do?topicIndex=${status.index}&create=${topic.message.updated.time}" />
+						<html:rewrite page="/authoring/viewTopic.do?sessionMapID=${sessionMapID}&topicIndex=${status.index}&create=${topic.message.updated.time}" />
 					</c:set> 
 					<html:link href="javascript:showMessage('${viewtopic}')">
 						<c:out value="${topic.message.subject}" />
@@ -32,3 +33,12 @@
 		</c:forEach>
 	</table>
 </div>
+<%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
+<script lang="javascript">
+ 
+	if(window.top != null){
+		window.top.hideMessage();
+		var obj = window.top.document.getElementById('messageListArea');
+		obj.innerHTML= document.getElementById("topiclist").innerHTML;
+	}
+</script>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -6,35 +6,21 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
-		<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();
-				}
+		<style type="text/css">
+			<!--
+			table.forum { 
+			width:98%; 
+			margin-left:7px; 
+			padding-top:5px; 
+			margin-bottom:10px;
+			background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 49px; 
+			text-align:left; 
+			border-bottom:1px solid #efefef;
 			}
-		</script>
-	<style type="text/css">
-	<!--
-	table.forum { 
-	width:98%; 
-	margin-left:7px; 
-	padding-top:5px; 
-	margin-bottom:10px;
-	background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 49px; 
-	text-align:left; 
-	border-bottom:1px solid #efefef;
-	}
-	-->
-	</style>
+			-->
+		</style>
 	</head>
 	<body>
-		<script type="text/javascript">
-			success();
-		</script>
 		<!--closes header-->
 		<table class="forum" >
 			<!-- Basic Info Form-->
@@ -73,13 +59,13 @@
 						<b><fmt:message key="button.cancel" /></b>
 					</html:link>
 					<c:set var="deletetopic">
-						<html:rewrite page="/authoring/deleteTopic.do?topicIndex=${topicIndex}" />
+						<html:rewrite page="/authoring/deleteTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}" />
 					</c:set>
 					<html:link href="${deletetopic}" styleClass="button space-left">
 						<b><fmt:message key="label.delete" /></b>
 					</html:link>
 					<c:set var="edittopic">
-						<html:rewrite page="/authoring/editTopic.do?topicIndex=${topicIndex}&create=${topic.message.created.time}" />
+						<html:rewrite page="/authoring/editTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}&create=${topic.message.created.time}" />
 					</c:set>
 					<html:link href="${edittopic}" styleClass="button space-left">
 						<b><fmt:message key="label.edit" /></b>
Index: lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -0,0 +1,24 @@
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<input type="hidden" name="hasAttachment" value="${itemAttachment.hasAttachment}"/>
+<c:choose>
+	<c:when test="${itemAttachment.hasAttachment}">
+		<table border="0" style="align:left;width:400px">
+		<tr><td>
+			<c:out value="${itemAttachment.attachmentName}" />
+		</td>
+		<td>
+			<a href="#" onclick="removeItemAttachment(${topicIndex})" class="button">
+				<fmt:message key="label.delete" />
+			</a>	
+		</td>
+		<td>
+			<img src="${ctxPath}/images/indicator.gif" style="display:none" id="itemAttachmentArea_Busy" />
+		</td>
+		</tr>
+		</table>
+	</c:when>
+	<c:otherwise>
+		<input type="file" name="attachmentFile" size="55"  /> 
+	</c:otherwise>
+</c:choose>
Index: lams_tool_forum/web/jsps/authoring/parts/offlinefilelist.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/parts/offlinefilelist.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/parts/offlinefilelist.jsp	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -0,0 +1,31 @@
+<%@ include file="/common/taglibs.jsp" %>
+<table style="align:left;width:600px" border="0" >
+	<c:forEach var="file" items="${offlineFileList}">
+	<tr>
+		<td>
+			<c:out value="${file.fileName}"/>
+		</td>
+		<td width="80px" align="center">
+			<c:set var="viewURL">
+				<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=false"/>
+			</c:set>
+			<html:link href="javascript:launchPopup('${viewURL}','offlinefile')" styleClass="button">
+				<fmt:message key="label.view"/>
+			</html:link>
+		</td>
+		<td width="100px" align="center">
+			<c:set var="downloadURL">
+					<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+			</c:set>
+			<html:link href="${downloadURL}"  styleClass="button">
+				<fmt:message key="label.download"/>
+			</html:link>
+		</td>
+		<td width="80px" align="center">
+			<html:link href="#" onclick="deleteOfflineFile(${file.fileUuid},${file.fileVersionId})" styleClass="button">
+				<fmt:message key="label.authoring.offline.delete"/>
+			</html:link>
+		</td>				
+	</tr>
+	</c:forEach>
+</table>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/parts/onlinefilelist.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/parts/onlinefilelist.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/parts/onlinefilelist.jsp	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -0,0 +1,31 @@
+<%@ include file="/common/taglibs.jsp" %>
+<table style="align:left;width:600px" border="0" >
+	<c:forEach var="file" items="${onlineFileList}">
+	<tr>
+		<td>
+			<c:out value="${file.fileName}"/>
+		</td>
+		<td width="80px" align="center">
+			<c:set var="viewURL">
+				<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=false"/>
+			</c:set>
+			<html:link href="javascript:launchPopup('${viewURL}','onlinefile')" styleClass="button">
+				<fmt:message key="label.view"/>
+			</html:link>
+		</td>
+		<td width="100px" align="center">
+			<c:set var="downloadURL">
+					<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+			</c:set>
+			<html:link href="${downloadURL}"  styleClass="button">
+				<fmt:message key="label.download"/>
+			</html:link>
+		</td>
+		<td width="80px" align="center">
+			<html:link href="#" onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})" styleClass="button">
+				<fmt:message key="label.authoring.online.delete"/>
+			</html:link>
+		</td>				
+	</tr>
+	</c:forEach>
+</table>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r0f16af06eaa594f2115829f31a5ddc1f8a59721d -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -45,6 +45,7 @@
 <%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
+<%@ attribute name="customiseSessionID" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
@@ -63,14 +64,14 @@
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}'/>";
 	}
     function doSubmit_Form_Only() {
     	document.getElementById("${formID}").submit();
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_larsrc/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r0f16af06eaa594f2115829f31a5ddc1f8a59721d -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2
--- lams_tool_larsrc/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 0f16af06eaa594f2115829f31a5ddc1f8a59721d)
+++ lams_tool_larsrc/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
@@ -33,16 +33,20 @@
 <%@ tag body-content="empty" %>
 <%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %>
 <%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="redirect" required="false" rtexprvalue="true" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <c:if test="${!empty progress}">
 		<c:set var="randomID">
 			<lams:generateID id="${id}"/>
 		</c:set>
-			<c:set var="passonurl_params" value="?${progress}&lessonID=${id}&uniqueID=${randomID}"/>
-			<c:set var="passonurl_nojs" value="passon.swf${passonurl_params}"/>
-			<c:set var="passonurl_js" value="passon${passonurl_params}"/>
+			<c:set var="passonurl_params" value="${progress}&lessonID=${id}&uniqueID=${randomID}"/>
+			<c:if test="${redirect}">
+				<c:set var="passonurl_params" value="redirect=true&${passonurl_params}"/>
+			</c:if>
 			
+			<c:set var="passonurl_nojs" value="passon.swf?${passonurl_params}"/>
+			<c:set var="passonurl_js" value="passon?${passonurl_params}"/>
 			<script type="text/javascript">
 				AC_FL_RunContent('classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000', 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0','width','1','height','1','align','left','src','<c:out value="${passonurl_js}" escapeXml="false"/>','quality','high','scale','noscale','bgcolor','#FFFFFF','name','passon', 'id', 'passon', 'allowscriptaccess','sameDomain', 'swliveconnect', true, 'type', 'application/x-shockwave-flash', 'pluginspage','http://www.macromedia.com/go/getflashplayer','movie','<c:out value="${passonurl_js}" escapeXml="false"/>' );
 			</script>