Index: lams_tool_chat/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/.classpath,v
diff -u -r1.3 -r1.4
--- lams_tool_chat/.classpath	5 May 2006 00:39:10 -0000	1.3
+++ lams_tool_chat/.classpath	16 May 2006 02:46:10 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	5 May 2006 00:51:23 -0000	1.5
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	16 May 2006 02:45:45 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	16 May 2006 02:45:45 -0000	1.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.3 -r1.4
--- lams_tool_chat/web/WEB-INF/lams.tld	20 Apr 2006 05:21:50 -0000	1.3
+++ lams_tool_chat/web/WEB-INF/lams.tld	16 May 2006 02:46:10 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_chat/web/WEB-INF/struts/struts-config.xml	19 Apr 2006 06:40:28 -0000	1.2
+++ lams_tool_chat/web/WEB-INF/struts/struts-config.xml	16 May 2006 02:46:10 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	16 May 2006 02:46:10 -0000	1.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/HTMLEditor.tag,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_chat/web/WEB-INF/tags/SetEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/SetEditor.tag,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_chat/web/WEB-INF/tags/Tab.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Tab.tag,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_chat/web/WEB-INF/tags/TabBody.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/TabBody.tag,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_chat/web/WEB-INF/tags/Tabs.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Tabs.tag,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/authoring.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_chat/web/pages/authoring/authoring.jsp	19 Apr 2006 06:40:27 -0000	1.3
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	16 May 2006 02:46:10 -0000	1.4
@@ -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>