Index: lams_tool_chat/.classpath
===================================================================
diff -u -r0e70aea7c73efe426b7e314e57e915b52a9820c1 -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/.classpath	(.../.classpath)	(revision 0e70aea7c73efe426b7e314e57e915b52a9820c1)
+++ lams_tool_chat/.classpath	(.../.classpath)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -10,5 +10,6 @@
 	<classpathentry kind="lib" path="lib/smack-2.2.0/smack.jar"/>
 	<classpathentry kind="lib" path="lib/smack-2.2.0/smackx.jar"/>
 	<classpathentry kind="lib" path="lib/smack-2.2.0/smackx-debug.jar"/>
+	<classpathentry sourcepath="/lams_central/src" kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
 	<classpathentry kind="output" path="build/classes/java"/>
 </classpath>
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
diff -u -rd9fc170eb230ed4487cec79193c2cfdc48f7436e -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision d9fc170eb230ed4487cec79193c2cfdc48f7436e)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -40,6 +40,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.chat.beans.AuthoringSessionBean;
 import org.lamsfoundation.lams.tool.chat.model.Chat;
@@ -189,6 +190,8 @@
 		// update form and return to page.
 		resetAuthSession(authSession, content);
 		authForm.setAuthSession(authSession);
+		
+        request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java
===================================================================
diff -u
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	(revision 0)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -0,0 +1,51 @@
+/****************************************************************
+ * 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.chat.web.actions;
+
+import javax.servlet.http.HttpSession;
+
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+
+/**
+ * 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(QaAction.SUBMIT_SUCCESS);
+		}
+	}
+
+		
+}
Index: lams_tool_chat/web/WEB-INF/lams.tld
===================================================================
diff -u -re2fd92838d76eb295d284fa45332fa2809d64cc7 -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e2fd92838d76eb295d284fa45332fa2809d64cc7)
+++ lams_tool_chat/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -2,7 +2,7 @@
 
 <taglib 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/web-jsptaglibrary_2_0.xsd"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
     version="2.0">
 
    <tlib-version>1.0</tlib-version>
@@ -275,8 +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_chat/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rb32ded72d955763a9b49e33e2dc2ab195d83564b -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision b32ded72d955763a9b49e33e2dc2ab195d83564b)
+++ lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -55,6 +55,13 @@
       />
     </action>
     <action
+      path="/clearsession"
+      type="org.lamsfoundation.lams.tool.chat.web.actions.ClearSessionAction"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
       path="/authoring"
       type="org.lamsfoundation.lams.tool.chat.web.actions.AuthoringAction"
       name="authoringForm"
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -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_chat/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -r196eee412e9be0d16fec7635a2b7813f16956f31 -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 196eee412e9be0d16fec7635a2b7813f16956f31)
+++ lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
Index: lams_tool_chat/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r196eee412e9be0d16fec7635a2b7813f16956f31 -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 196eee412e9be0d16fec7635a2b7813f16956f31)
+++ lams_tool_chat/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
Index: lams_tool_chat/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r196eee412e9be0d16fec7635a2b7813f16956f31 -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 196eee412e9be0d16fec7635a2b7813f16956f31)
+++ lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
@@ -35,22 +35,32 @@
 <%@ attribute name="value" required="false" rtexprvalue="true" %>
 <%@ attribute name="key" required="false" rtexprvalue="true" %>
 <%@ attribute name="inactive" required="false" rtexprvalue="true" %>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true" %>
+
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="methodCall" value="selectTab"/>
-<c:set var="title" value="${value}"/>
+<c:set var="tabTitle" value="${value}"/>
 <c:set var="tableftFile" value="aqua_tab_left.gif"/>
 <c:set var="tabrightFile" value="aqua_tab_right.gif"/>
 <c:set var="tabcentreClass" value="tab tabcentre"/>
 
-<c:if test="${dControl}">
-	<c:set var="methodCall" value="doSelectTab"/>
+<% // Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+   // this is handy if the page needs different logic on initialisation and user switching tabs %>
+<c:if test="${methodCall == null}">
+	<c:choose>
+	<c:when test="${dControl}">
+		<c:set var="methodCall" value="doSelectTab"/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="methodCall" value="selectTab"/>
+	</c:otherwise>
+	</c:choose>
 </c:if>
-
+ 
 <c:if test="${key != null && value == null}">
-	<c:set var="title"><bean:message name="key" scope="page"/></c:set>
+	<c:set var="tabTitle"><bean:message name="key" scope="page"/></c:set>
 </c:if>
 
 <c:if test="${inactive}">
@@ -63,7 +73,7 @@
 	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
 	  <tr>
 		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}"/></a></td>
-		<td class="${tabcentreClass}" id="tab${id}"  onClick="${methodCall}(${id});return false;"  nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${title}</a></td>
+		<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${tabTitle}</a></td>
 		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}"/></a></td></tr>
 	</table>
 </td>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r196eee412e9be0d16fec7635a2b7813f16956f31 -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 196eee412e9be0d16fec7635a2b7813f16956f31)
+++ lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
@@ -32,18 +32,18 @@
  %>
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="title" required="false" rtexprvalue="true" %>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true" %>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="page" required="false" rtexprvalue="true" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
 
 <!-- begin tab content -->
 <div id="tabbody${id}">
-<c:if test="${title != null}">
-	<h2><font size=2> <b><bean:write name="title" scope="page"/></b></font></h2>
+<c:if test="${tabTitle != null}">
+	<h2><font size=2> <b><bean:write name="tabTitle" scope="page"/></b></font></h2>
 </c:if>
-<c:if test="${titleKey != null && title == null}">
+<c:if test="${titleKey != null && tabTitle == null}">
 	<h2><font size=2> <b><bean:message name="titleKey" scope="page"/></b></font></h2>
 </c:if>
 
Index: lams_tool_chat/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r196eee412e9be0d16fec7635a2b7813f16956f31 -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 196eee412e9be0d16fec7635a2b7813f16956f31)
+++ lams_tool_chat/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -2,11 +2,11 @@
 /****************************************************************
  * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rb32ded72d955763a9b49e33e2dc2ab195d83564b -re1582051fac0c62608ec525ed2de8b666699ac86
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision b32ded72d955763a9b49e33e2dc2ab195d83564b)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
@@ -7,10 +7,10 @@
 </lams:Tabs>
 
 <div class="tabbody">
-	<html:form action="/authoring" method="post" enctype="multipart/form-data">
+	<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
 		<html:hidden property="toolContentID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="dispatch" />
+		<html:hidden property="dispatch" value="updateContent"/>
 		<html:hidden property="authSessionId" />
 
 		<div id="message" align="center">
@@ -34,14 +34,10 @@
 		<hr />
 
 		<%-- Form Controls --%>
-		<div align="right">
-			<html:link href="javascript:doSubmit('updateContent');" property="submit" styleClass="button">
-				<fmt:message key="button.save" />
-			</html:link>
-			<html:link href="javascript:;" property="cancel" onclick="window.close()" styleClass="button">
-				<fmt:message key="button.cancel" />
-			</html:link>
-		</div>
+		<!-- 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="lachat11" 
+			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${formBean.toolContentID}" />					
 	</html:form>
 </div>