Index: lams_tool_forum/.classpath
===================================================================
diff -u -ra95235508798fd78a88bd54a8f067b4936a1d8fa -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/.classpath	(.../.classpath)	(revision a95235508798fd78a88bd54a8f067b4936a1d8fa)
+++ lams_tool_forum/.classpath	(.../.classpath)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -10,5 +10,6 @@
 	<classpathentry sourcepath="/lams_learning" kind="lib" path="/lams_build/lib/lams/lams-learning.jar"/>
 	<classpathentry kind="lib" path="D:/jboss-4.0.2/server/default/deploy/jboss-hibernate.deployer/jboss-hibernate.jar"/>
 	<classpathentry kind="lib" path="D:/jboss-4.0.2/server/default/lib/jboss-cache.jar"/>
+	<classpathentry sourcepath="/lams_central/src" kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
 	<classpathentry kind="output" path="classes/java"/>
 </classpath>
Index: lams_tool_forum/build.xml
===================================================================
diff -u -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -65,7 +65,7 @@
 			
 	<target name="compile-java" description="Compiles the Task" depends="init">
 		<javac srcdir="${src.java.dir}"
-            source="1.4"
+            source="1.5"
             debug="on"
             compiler="modern"
             classpathref="project.classpath"
Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
diff -u -rd406ca9a724ed2d84639b60cd414d2724c51761c -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d406ca9a724ed2d84639b60cd414d2724c51761c)
+++ lams_tool_forum/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -1,3 +1,4 @@
+signature=lafrum11
 appName = forum 
 #language code: en 
 #locale code: AU 
@@ -139,3 +140,6 @@
 
 
 #======= End labels: Exported 130 labels for en AU =====
+#======= New labels: after 12/05/2006 =============
+authoring.msg.cancel.save=Do you want to close this window without saving?
+
Index: lams_tool_forum/conf/language/ApplicationResources_bg.properties
===================================================================
diff -u -r269b72939e85e636c756b51cc035c8c8865deb67 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/conf/language/ApplicationResources_bg.properties	(.../ApplicationResources_bg.properties)	(revision 269b72939e85e636c756b51cc035c8c8865deb67)
+++ lams_tool_forum/conf/language/ApplicationResources_bg.properties	(.../ApplicationResources_bg.properties)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -1,3 +1,4 @@
+signature=lafrum11
 appName = forum 
 #language code: bg 
 #locale code:  
Index: lams_tool_forum/conf/language/ApplicationResources_es.properties
===================================================================
diff -u -r269b72939e85e636c756b51cc035c8c8865deb67 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/conf/language/ApplicationResources_es.properties	(.../ApplicationResources_es.properties)	(revision 269b72939e85e636c756b51cc035c8c8865deb67)
+++ lams_tool_forum/conf/language/ApplicationResources_es.properties	(.../ApplicationResources_es.properties)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -1,3 +1,4 @@
+signature=lafrum11
 appName = forum 
 #language code: es 
 #locale code:  
Index: lams_tool_forum/conf/language/ApplicationResources_fr.properties
===================================================================
diff -u -rb28b527c4da4045f9ab28def4975fab279ce401b -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/conf/language/ApplicationResources_fr.properties	(.../ApplicationResources_fr.properties)	(revision b28b527c4da4045f9ab28def4975fab279ce401b)
+++ lams_tool_forum/conf/language/ApplicationResources_fr.properties	(.../ApplicationResources_fr.properties)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -1,3 +1,4 @@
+signature=lafrum11
 appName = forum 
 #language code: fr 
 #locale code:  
Index: lams_tool_forum/conf/language/ApplicationResources_it.properties
===================================================================
diff -u -r269b72939e85e636c756b51cc035c8c8865deb67 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/conf/language/ApplicationResources_it.properties	(.../ApplicationResources_it.properties)	(revision 269b72939e85e636c756b51cc035c8c8865deb67)
+++ lams_tool_forum/conf/language/ApplicationResources_it.properties	(.../ApplicationResources_it.properties)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -1,3 +1,4 @@
+signature=lafrum11
 appName = forum 
 #language code: it 
 #locale code:  
Index: lams_tool_forum/conf/language/ApplicationResources_sv.properties
===================================================================
diff -u -r269b72939e85e636c756b51cc035c8c8865deb67 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/conf/language/ApplicationResources_sv.properties	(.../ApplicationResources_sv.properties)	(revision 269b72939e85e636c756b51cc035c8c8865deb67)
+++ lams_tool_forum/conf/language/ApplicationResources_sv.properties	(.../ApplicationResources_sv.properties)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -1,3 +1,4 @@
+signature=lafrum11
 appName = forum 
 #language code: sv 
 #locale code:  
Index: lams_tool_forum/conf/language/ApplicationResources_zh_CN.properties
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/conf/language/ApplicationResources_zh_CN.properties	(.../ApplicationResources_zh_CN.properties)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_tool_forum/conf/language/ApplicationResources_zh_CN.properties	(.../ApplicationResources_zh_CN.properties)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -2,6 +2,7 @@
 # Language strings for the Forum tool.
 
 # ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+signature=lafrum11
 activity.title=Forum
 activity.description=Online threaded discussion tool (asynchronous).
 activity.helptext=Discussion tool useful for long running collaborations and situations where learners are not all on line at the same time.
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -re6e4c5d47aec32f4d9248c009cad07165289237b -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision e6e4c5d47aec32f4d9248c009cad07165289237b)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -294,4 +294,7 @@
 		<action path="/blank" type="org.apache.struts.actions.ForwardAction"
 			parameter="tiles:/blank" />
 							
-				
+		<!-- ========== BEGIN: Common ============================== -->
+		<action path="/clearsession"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ClearSessionAction">
+		</action>				
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -49,6 +49,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
@@ -323,6 +324,7 @@
 		}
 		
     	String mode = (String) request.getSession().getAttribute(ForumConstants.MODE);
+    	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
     	if(StringUtils.equals(mode,ForumConstants.AUTHOR_MODE))
     		return mapping.findForward("author");
     	else
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -0,0 +1,54 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.forum.web.actions;
+
+import javax.servlet.http.HttpSession;
+
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
+
+/**
+ * This class give a chance to clear HttpSession when user save/close authoring page.
+ * @author Steve.Ni
+ * 
+ * @version $Revision$
+ */
+public class ClearSessionAction extends LamsAuthoringFinishAction {
+
+	@Override
+	public void clearSession(HttpSession session, ToolAccessMode mode) {
+		if(mode.isAuthor()){
+			session.removeAttribute(ForumConstants.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);
+		}
+	}
+
+		
+}
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
diff -u -r10071967b5c1e8a0352207114e694b0533708af5 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 10071967b5c1e8a0352207114e694b0533708af5)
+++ lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -63,6 +63,15 @@
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
 
+      <attribute>
+         <description>Output stylesheet based on the user preferences.</description>
+         <name>localLink</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
 
   	<tag>
@@ -265,5 +274,9 @@
        <name>SetEditor</name>
        <path>/WEB-INF/tags/SetEditor.tag</path>
    	</tag-file>
+   	<tag-file>
+       <name>AuthoringButton</name>
+       <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>   	
 
 </taglib>
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -319,6 +319,10 @@
 			parameter="tiles:/error" />
 		<action path="/blank" type="org.apache.struts.actions.ForwardAction"
 			parameter="tiles:/blank" />
+		<!-- ========== BEGIN: Common ============================== -->
+		<action path="/clearsession"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ClearSessionAction">
+		</action>				
 
   </action-mappings>
 
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -0,0 +1,90 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * AuthoringButton.tag
+  *	Author: Dapeng Ni
+  *	Description: Creates the save/cancel button for authoring page
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+
+<%@ attribute name="formID" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
+<%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="accessMode" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="label.authoring.cancel.button" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="label.authoring.save.button" scope="request"/>
+</c:if>
+<c:if test="${empty cancelConfirmMsgKey}">
+	<c:set var="cancelConfirmMsgKey" value="authoring.msg.cancel.save" scope="request"/>
+</c:if>
+<c:if test="${empty accessMode}">
+	<c:set var="accessMode" value="author" scope="request"/>
+</c:if>
+
+<!-- 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}'/>";
+		}
+        function doSubmit() {
+        	document.getElementById("${formID}").submit();
+        }
+        function doCancel() {
+        	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
+	        	//just for depress alert window when call window.close()
+	        	//only available for IE browser
+	        	var userAgent=navigator.userAgent;
+	        	if(userAgent.indexOf('MSIE') != -1)
+		        	window.opener = "authoring"
+	        	window.close();
+			}
+        }  				
+</script>				
+<p align="right">
+	<html:link href="javascript:doSubmit();" property="submit" styleClass="button">
+		<fmt:message key="${saveButtonLabelKey}" /> 
+	</html:link>
+	<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button">
+		<fmt:message key="${cancelButtonLabelKey}" />
+	</html:link>
+</p>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -r3080478ec97071f97aa35c5eb46fa2552e652f83 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -40,17 +40,6 @@
 	</tr>
 </table>
 
-<!-- Button Row -->
-<hr/>
-<p align="right">
-	<html:submit property="save" styleClass="button">
-		<fmt:message key="label.authoring.save.button" />
-	</html:submit>
-	<html:button property="cancel" onclick="window.close()" styleClass="button">
-		<fmt:message key="label.authoring.cancel.button" />
-	</html:button>
-</p>
-
 	<script type="text/javascript">
 			var limit = document.getElementById("limitedInput");
 			var rich = document.getElementById("richEditor");
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r3080478ec97071f97aa35c5eb46fa2552e652f83 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -1,6 +1,6 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<html:form action="authoring/update" method="post" enctype="multipart/form-data">
+<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	<html:hidden property="toolContentID" />
 	<html:hidden property="currentTab" styleId="currentTab" />
@@ -15,6 +15,18 @@
 		<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
 		<lams:TabBody id="2" titleKey="authoring.tab.advanced" page="advance.jsp" />
 		<lams:TabBody id="3" titleKey="authoring.tab.instructions" page="instructions.jsp" />
+		<!-- Button Row -->
+		<%--  Default value 
+				cancelButtonLabelKey="label.authoring.cancel.button"
+				saveButtonLabelKey="label.authoring.save.button"
+				cancelConfirmMsgKey="authoring.msg.cancel.save"
+				accessMode="author"
+		--%>
+		<c:set var="toolSignature">
+			<fmt:message key="signature" />
+		</c:set>
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="${toolSignature}" toolContentID="${formBean.toolContentID}" />
+		
 	</div>
 
 </html:form>
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r3080478ec97071f97aa35c5eb46fa2552e652f83 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -63,20 +63,6 @@
 	</tr>
 	<tr>
 		<td colspan="2">
-			<!-- Button Row -->
-			<HR>
-			<p align="right">
-				<html:submit property="save" styleClass="button">
-					<fmt:message key="label.authoring.save.button" />
-				</html:submit>
-				<html:button property="cancel" onclick="window.close()" styleClass="button">
-					<fmt:message key="label.authoring.cancel.button" />
-				</html:button>
-			</p>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
 			<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" id="messageArea" name="messageArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
 			</iframe>
 		</td>
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
diff -u -r3080478ec97071f97aa35c5eb46fa2552e652f83 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision 3080478ec97071f97aa35c5eb46fa2552e652f83)
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -126,13 +126,3 @@
 		</td>
 	</tr>
 </table>
-<!-- Button Row -->
-<hr/>
-<p align="right">
-	<html:submit property="save" styleClass="button">
-		<fmt:message key="label.authoring.save.button" />
-	</html:submit>
-	<html:button property="cancel" onclick="window.close()" styleClass="button">
-		<fmt:message key="label.authoring.cancel.button" />
-	</html:button>
-</p>
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java
===================================================================
diff -u -r50d68fddcd33b33903cd4c0119f01080b9314b80 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -29,18 +29,27 @@
 import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
-
+/**
+ * This class give a chance to clear HttpSession when user save/close authoring page.
+ * @author Steve.Ni
+ * 
+ * @version $Revision$
+ */
 public class ClearSessionAction extends LamsAuthoringFinishAction {
 
 	@Override
 	public void clearSession(HttpSession session, ToolAccessMode mode) {
-		session.removeAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID);
-		session.removeAttribute(ResourceConstants.ATT_ATTACHMENT_LIST);
-		session.removeAttribute(ResourceConstants.ATTR_DELETED_ATTACHMENT_LIST);
-		session.removeAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
-		session.removeAttribute(ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
-		session.removeAttribute(ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST);		
+		if(mode.isAuthor()){
+			session.removeAttribute(AttributeNames.ATTR_MODE);
+			session.removeAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID);
+			session.removeAttribute(ResourceConstants.ATT_ATTACHMENT_LIST);
+			session.removeAttribute(ResourceConstants.ATTR_DELETED_ATTACHMENT_LIST);
+			session.removeAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
+			session.removeAttribute(ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
+			session.removeAttribute(ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST);
+		}
 	}
 
 		
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r111bade25b2f36532bfe692b4292f56a5969094b -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 111bade25b2f36532bfe692b4292f56a5969094b)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -39,6 +39,8 @@
 <%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
 <%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
 
+<%-- Optional attribute --%>
+<%@ attribute name="accessMode" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
@@ -53,18 +55,21 @@
 <c:if test="${empty cancelConfirmMsgKey}">
 	<c:set var="cancelConfirmMsgKey" value="authoring.msg.cancel.save" scope="request"/>
 </c:if>
+<c:if test="${empty accessMode}">
+	<c:set var="accessMode" value="author" scope="request"/>
+</c:if>
 
 <!-- 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=learner&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 		}
         function doSubmit() {
         	document.getElementById("${formID}").submit();
         }
         function doCancel() {
         	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=learner'/>";
+	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
 	        	//just for depress alert window when call window.close()
 	        	//only available for IE browser
 	        	var userAgent=navigator.userAgent;
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r50d68fddcd33b33903cd4c0119f01080b9314b80 -rb9a105856c81f49b60f18e80bf9ee1bc7913f390
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision b9a105856c81f49b60f18e80bf9ee1bc7913f390)
@@ -101,9 +101,10 @@
 
 			<!-- Button Row -->
 			<%--  Default value 
-				<c:set var="cancelButtonLabelKey">label.authoring.cancel.button</c:set>
-				<c:set var="saveButtonLabelKey">label.authoring.save.button</c:set>
-				<c:set var="cancelConfirmMsgKey">authoring.msg.cancel.save</c:set>
+				cancelButtonLabelKey="label.authoring.cancel.button"
+				saveButtonLabelKey="label.authoring.save.button"
+				cancelConfirmMsgKey="authoring.msg.cancel.save"
+				accessMode="author"
 			--%>
 			<c:set var="toolSignature">
 				<fmt:message key="signature" />