Index: lams_tool_lamc/.classpath
===================================================================
diff -u -rd2692870e0d3e9ac3dce62abfa198b533c4e3df6 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/.classpath	(.../.classpath)	(revision d2692870e0d3e9ac3dce62abfa198b533c4e3df6)
+++ lams_tool_lamc/.classpath	(.../.classpath)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -8,5 +8,6 @@
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-learning.jar"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry sourcepath="/lams_central/src" kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: lams_tool_lamc/conf/language/ApplicationResources.properties
===================================================================
diff -u -re263e51e8e1faf1463ea508f5432bcde98a88652 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e263e51e8e1faf1463ea508f5432bcde98a88652)
+++ lams_tool_lamc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -235,3 +235,5 @@
 
 
 #======= End labels: Exported 226 labels for en AU =====
+#======= Add on 16/05/2006 =====
+authoring.msg.cancel.save=Do you want to close this window without saving?
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java	(revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -0,0 +1,105 @@
+/****************************************************************
+ * 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.mc.web;
+
+import javax.servlet.http.HttpSession;
+
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+/**
+ * This class give a chance to clear HttpSession when user save/close authoring page.
+ * @author Steve.Ni
+ * ----------------XDoclet Tags--------------------
+ * 
+ * @struts:action path="/clearsession"   validate="false"
+ *                
+ * @version $Revision$
+ */
+public class ClearSessionAction extends LamsAuthoringFinishAction {
+
+	@Override
+	public void clearSession(HttpSession session, ToolAccessMode mode) {
+		//only this tool save LAMS_AUTHORING_SUCCESS_FLAG into session, remove it!!!
+		session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
+		if(mode.isAuthor()){
+			session.removeAttribute(McAction.SUBMIT_SUCCESS);
+			session.removeAttribute(McAction.USER_EXCEPTION_QUESTION_EMPTY);
+			session.removeAttribute(McAction.MAX_QUESTION_INDEX);
+			session.removeAttribute(McAction.USER_EXCEPTION_WEIGHT_TOTAL);
+			session.removeAttribute(McAction.MAP_WEIGHTS);
+			session.removeAttribute(McAction.EDIT_OPTIONS_MODE);
+			session.removeAttribute(McAction.MAP_GENERAL_OPTIONS_CONTENT);
+			session.removeAttribute(McAction.MAP_GENERAL_SELECTED_OPTIONS_CONTENT);
+			session.removeAttribute(McAction.MAP_INCORRECT_FEEDBACK);
+			session.removeAttribute(McAction.MAP_CORRECT_FEEDBACK);
+			session.removeAttribute(McAction.TOOL_CONTENT_ID);
+			session.removeAttribute(McAction.SELECTED_QUESTION_INDEX);
+			session.removeAttribute(McAction.DEFAULT_QUESTION_UID);
+			session.removeAttribute(McAction.USER_EXCEPTION_ANSWERS_DUPLICATE);
+			session.removeAttribute(McAction.USER_EXCEPTION_ANSWER_EMPTY);
+			session.removeAttribute(McAction.LIST_UPLOADED_OFFLINE_FILENAMES);
+			session.removeAttribute(McAction.LIST_UPLOADED_ONLINE_FILENAMES);
+			session.removeAttribute(McAction.CREATION_DATE);
+			session.removeAttribute(McAction.LIST_OFFLINEFILES_METADATA);
+			session.removeAttribute(McAction.LIST_ONLINEFILES_METADATA);
+			session.removeAttribute(McAction.QUESTIONS_WITHNO_OPTIONS);
+			session.removeAttribute(McAction.RICHTEXT_CORRECT_FEEDBACK);
+			session.removeAttribute(McAction.RICHTEXT_END_LEARNING_MSG);
+			session.removeAttribute(McAction.RICHTEXT_OFFLINEINSTRUCTIONS);
+			session.removeAttribute(McAction.RICHTEXT_ONLINEINSTRUCTIONS);
+			session.removeAttribute(McAction.RICHTEXT_INSTRUCTIONS);
+			session.removeAttribute(McAction.MAP_STARTUP_GENERAL_OPTIONS_CONTENT);
+			session.removeAttribute(McAction.MAP_STARTUP_GENERAL_OPTIONS_QUEID);
+			session.removeAttribute(McAction.MAP_STARTUP_GENERAL_SELECTED_OPTIONS_CONTENT);
+			session.removeAttribute(McAction.SHOW_AUTHORING_TABS);
+			session.removeAttribute(McAction.MAP_SELECTED_OPTIONS);
+			session.removeAttribute(McAction.SELECTED_QUESTION);
+			session.removeAttribute(McAction.DEFINE_LATER_IN_EDIT_MODE);
+			session.removeAttribute(McAction.RICHTEXT_TITLE);
+			session.removeAttribute(McAction.RICHTEXT_REPORT_TITLE);
+			session.removeAttribute(McAction.DEFAULT_CONTENT_ID);
+			session.removeAttribute(McAction.DEFINE_LATER);
+			session.removeAttribute(McAction.MAP_DISABLED_QUESTIONS);
+			session.removeAttribute(McAction.MAP_QUESTIONS_CONTENT);
+			session.removeAttribute(McAction.IS_REVISITING_USER);
+			session.removeAttribute(McAction.MAP_CHECKBOX_STATES);
+			session.removeAttribute(McAction.ACTIVE_MODULE);
+			session.removeAttribute("queIndex");
+			session.removeAttribute(McAction.MAP_OPTIONS_CONTENT);
+			session.removeAttribute(McAction.MAP_STARTUP_GENERAL_SELECTED_OPTIONS_CONTENT);
+			session.removeAttribute(McAction.PASSMARK);
+			session.removeAttribute(McAction.TOOL_SERVICE);
+			session.removeAttribute(McAction.MAP_DEFAULTOPTIONS_CONTENT);
+			session.removeAttribute(McAction.RETRIES);
+			session.removeAttribute(McAction.DEFINE_LATER_EDIT_ACTIVITY);
+			session.removeAttribute("optionIndex");
+		}
+	}
+
+		
+}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rc9531327d15636b54f293077ee1cd9f60195381b -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -39,6 +39,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.mc.McAppConstants;
@@ -2045,6 +2046,10 @@
 		}
     	
 		McUtils.debugMaps(request);
+		
+		//because button (and javascript) will display in LamsTag tab, so put it into session instead of request
+		//it will be remove immediately in clearSessionAction.
+        request.getSession().setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
 		return (mapping.findForward(destination));
     }
 
Index: lams_tool_lamc/web/WEB-INF/lams.tld
===================================================================
diff -u -r9bf9b53faf1c91294d4c2d9a306cb896e131d373 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9bf9b53faf1c91294d4c2d9a306cb896e131d373)
+++ lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -275,7 +275,12 @@
        <path>/WEB-INF/tags/SetEditor.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringButton</name>
+       <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>   	
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>
+   	</tag-file>   	
+
 </taglib>
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -re3a73acd76eba38b1cc275e6da895b0a65544767 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision e3a73acd76eba38b1cc275e6da895b0a65544767)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -482,6 +482,10 @@
 		    redirect="false"
 	  	/>
     </action>
+	
+	<action path="/clearsession"
+		type="org.lamsfoundation.lams.tool.mc.web.ClearSessionAction">
+	</action>       
  </action-mappings>
 	
 	<message-resources parameter="org.lamsfoundation.lams.tool.mc.ApplicationResources"/>
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -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_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -3,7 +3,7 @@
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.tool.mc.web.ApplicationResources</param-value>
+  	<param-value>org.lamsfoundation.lams.tool.mc.ApplicationResources</param-value>
 	</context-param>
 	
 	<context-param> 
Index: lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -re6e6aa4b83b6a5f62f7cae530495663c3bab242e -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e)
+++ lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -123,8 +123,8 @@
 
 	<b> <font size=2> <bean:message key="label.authoring.mc"/> </font></b>
 	
-	<html:form  action="/authoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">
-	<html:hidden property="dispatch"/>
+	<html:form  action="/authoring?validate=false" styleId="authoringForm" enctype="multipart/form-data" method="POST" target="_self">
+	<html:hidden property="dispatch" value="submitQuestions"/>
 	<html:hidden property="toolContentID"/>
 	<html:hidden property="currentTab" styleId="currentTab" />
 	
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -270,17 +270,10 @@
 		 				 <tr>
 	 						<td NOWRAP valign=top> </td> 
 							<td NOWRAP class="input" colspan=3 align=left valign=top>								
-								<font size=2>
-									<p align="right">
-										<html:link href="javascript:submitMethod('submitQuestions');" property="submit" styleClass="button">
-											<bean:message key="button.submit" />
-										</html:link>
-										<html:link href="javascript:;" property="cancel"
-											onclick="window.close()" styleClass="button">
-											<bean:message key="button.cancel" />
-										</html:link>
-									</p>
-								</font>	
+								<!-- Button Row -->
+								<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+								<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
+									cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.submit" toolContentID="${formBean.toolContentID}" />									
 			 			  	</td>
 							<td NOWRAP valign=top> </td> 
 							<td NOWRAP valign=top> </td>
Index: lams_tool_vote/.classpath
===================================================================
diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_vote/.classpath	(.../.classpath)	(revision 402985c35e80fbce6960c7d7598b0262292398eb)
+++ lams_tool_vote/.classpath	(.../.classpath)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -8,5 +8,6 @@
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-learning.jar"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry sourcepath="/lams_central/src" kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
diff -u -r3b64c6601406dbff613c45f894d03e1fa7959646 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_vote/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3b64c6601406dbff613c45f894d03e1fa7959646)
+++ lams_tool_vote/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -105,3 +105,5 @@
 
 
 #======= End labels: Exported 96 labels for en AU =====
+#======= Add on 16/05/2006 =====
+authoring.msg.cancel.save=Do you want to close this window without saving?
\ No newline at end of file
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
===================================================================
diff -u
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java	(revision 0)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -0,0 +1,79 @@
+/****************************************************************
+ * 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.vote.web;
+
+import javax.servlet.http.HttpSession;
+
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+/**
+ * This class give a chance to clear HttpSession when user save/close authoring page.
+ * @author Steve.Ni
+ * ----------------XDoclet Tags--------------------
+ * 
+ * @struts:action path="/clearsession"   validate="false"
+ *                
+ * @version $Revision$
+ */
+public class ClearSessionAction extends LamsAuthoringFinishAction {
+
+	@Override
+	public void clearSession(HttpSession session, ToolAccessMode mode) {
+		if(mode.isAuthor()){
+			session.removeAttribute(VoteAction.MAP_OPTIONS_CONTENT);
+			session.removeAttribute(VoteAction.ACTIVITY_INSTRUCTIONS);
+			session.removeAttribute(VoteAction.TOOL_SERVICE);
+			session.removeAttribute(VoteAction.TOOL_CONTENT_ID);
+			session.removeAttribute(VoteAction.MAX_OPTION_INDEX);
+			session.removeAttribute(VoteAction.USER_EXCEPTION_NO_TOOL_SESSIONS);
+			session.removeAttribute(VoteAction.ATTACHMENT_LIST);
+			session.removeAttribute(VoteAction.DELETED_ATTACHMENT_LIST);
+			session.removeAttribute(VoteAction.LIST_OFFLINEFILES_METADATA);
+			session.removeAttribute(VoteAction.LIST_ONLINEFILES_METADATA);
+			session.removeAttribute(VoteAction.DEFINE_LATER_IN_EDIT_MODE);
+			session.removeAttribute(VoteAction.SHOW_AUTHORING_TABS);
+			session.removeAttribute(VoteAction.IS_MONITORED_CONTENT_IN_USE);
+			session.removeAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID);
+			session.removeAttribute(VoteAction.DEFAULT_OPTION_CONTENT);
+			session.removeAttribute(VoteAction.RICHTEXT_OFFLINEINSTRUCTIONS);
+			session.removeAttribute(VoteAction.RICHTEXT_ONLINEINSTRUCTIONS);
+			session.removeAttribute(VoteAction.ACTIVITY_TITLE);
+			session.removeAttribute("optIndex");
+			session.removeAttribute(VoteAction.LIST_UPLOADED_OFFLINE_FILENAMES);
+			session.removeAttribute(VoteAction.LIST_UPLOADED_ONLINE_FILENAMES);
+			session.removeAttribute(VoteAction.RICHTEXT_TITLE);
+			session.removeAttribute(VoteAction.RICHTEXT_TITLE);
+			session.removeAttribute(VoteAction.DEFAULT_CONTENT_ID_STR);
+			session.removeAttribute(VoteAction.DEFAULT_CONTENT_ID);
+			session.removeAttribute(VoteAction.ACTIVE_MODULE);
+			session.removeAttribute(VoteAction.IS_DEFINE_LATER);
+			
+		}
+	}
+
+		
+}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -re6fd15100d6bd9a0196f6a086a2df9b6df1aed40 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision e6fd15100d6bd9a0196f6a086a2df9b6df1aed40)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -38,6 +38,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
@@ -453,6 +454,8 @@
 		logger.debug("final submit status :" +voteAuthoringForm.getSbmtSuccess());
 		logger.debug("final duplicate status :" +request.getAttribute(USER_EXCEPTION_OPTIONS_DUPLICATE));
 		logger.debug("fwding to destination :" +destination);
+		
+        request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
         return (mapping.findForward(destination));	
     }
 
Index: lams_tool_vote/web/WEB-INF/lams.tld
===================================================================
diff -u -r9bf9b53faf1c91294d4c2d9a306cb896e131d373 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_vote/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9bf9b53faf1c91294d4c2d9a306cb896e131d373)
+++ lams_tool_vote/web/WEB-INF/lams.tld	(.../lams.tld)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -275,7 +275,12 @@
        <path>/WEB-INF/tags/SetEditor.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringButton</name>
+       <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>   	
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>
+   	</tag-file>   	
+
 </taglib>
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
diff -u -re6fd15100d6bd9a0196f6a086a2df9b6df1aed40 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision e6fd15100d6bd9a0196f6a086a2df9b6df1aed40)
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -457,6 +457,10 @@
 		    redirect="false"
 	  	/>
 	</action>  
+	
+	<action path="/clearsession"
+		type="org.lamsfoundation.lams.tool.vote.web.ClearSessionAction">
+	</action>    	
  </action-mappings>
 	
 	<message-resources parameter="org.lamsfoundation.lams.tool.vote.ApplicationResources"/>
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -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_vote/web/WEB-INF/web.xml
===================================================================
diff -u -rb523c049772bec9396882cecd81fdb23a91b5c19 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision b523c049772bec9396882cecd81fdb23a91b5c19)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -23,7 +23,7 @@
 -->
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.tool.vote.web.ApplicationResources</param-value>
+  	<param-value>org.lamsfoundation.lams.tool.vote.ApplicationResources</param-value>
 	</context-param>
 	
 	<context-param> 
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -rb981d563ace42f1c943a2e847aa2f725249b82a8 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision b981d563ace42f1c943a2e847aa2f725249b82a8)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -138,8 +138,8 @@
 
 	<b> <font size=2> <bean:message key="label.authoring.vote"/> </font></b>
 	
-	<html:form  action="/authoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">
-	<html:hidden property="dispatch"/>
+	<html:form  styleId="authoringForm" action="/authoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">
+	<html:hidden property="dispatch" value="submitAllContent"/>
 	<html:hidden property="toolContentID"/>
 	<html:hidden property="currentTab" styleId="currentTab" />
 	<html:hidden property="activeModule"/>
@@ -160,6 +160,11 @@
 		<!-- tab content 3 (Instructions) -->
 		<lams:TabBody id="3" titleKey="label.instructions" page="InstructionsContent.jsp" />
 		<!-- end of content (Instructions) -->
+		<!-- Button Row -->
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lavote11" 
+			cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" />		
+		
 	</c:if> 			
 	
 
@@ -181,6 +186,10 @@
 		<!-- tab content 1 (Basic) -->
 		<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
 		<!-- end of content (Basic) -->
+		<!-- Button Row -->
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lavote11" 
+			cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" />			
 	</c:if> 			
 
 	
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -re6fd15100d6bd9a0196f6a086a2df9b6df1aed40 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision e6fd15100d6bd9a0196f6a086a2df9b6df1aed40)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -150,11 +150,6 @@
 					
 					</table>
 
-	<HR>
-		<p align="right">
-	        <a href="javascript:submitMethod('submitAllContent')" class="button"><bean:message key="label.save"/></a>
-	        <a href="javascript:window.close()" class="button"><bean:message key="label.cancel"/></a>
-		</p>
 
 <SCRIPT language="JavaScript">