Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u -r87a9ebd25b4efd41d7383bd7b41a92322c0174ce -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 87a9ebd25b4efd41d7383bd7b41a92322c0174ce)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -74,6 +74,7 @@
     private static final String RE_EDIT_URL = "reEditUrl";
 
     private static final String PARAM_DEFINE_LATER = "defineLater";
+    private static final String PARAM_NOTIFY_CLOSE_URL = "notifyCloseURL";
 
     /**
      * Action method, will handle save/cancel action.
@@ -83,7 +84,8 @@
 	String action = request.getParameter(ACTION_NAME);
 	String modeStr = request.getParameter(ACTION_MODE);
 	String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID);
-
+	String notifyCloseURL = (String) request.getSession().getAttribute(PARAM_NOTIFY_CLOSE_URL);
+	
 	// clear session according to the ToolAccessMode.
 	if (StringUtils.equals(ToolAccessMode.LEARNER.toString(), modeStr))
 	    clearSession(cSessionID, request.getSession(), ToolAccessMode.LEARNER);
@@ -122,6 +124,10 @@
 	    }
 	    tool.getServiceName();
 	    nextUrl = WebUtil.appendParameterToURL(nextUrl, RE_EDIT_URL, URLEncoder.encode(reeditUrl, "UTF-8"));
+
+	    if (!StringUtils.isBlank(notifyCloseURL)) {
+		nextUrl = WebUtil.appendParameterToURL(nextUrl, PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
+	    }
 	    response.sendRedirect(nextUrl);
 	}
 	if (StringUtils.equals(action, CANCEL_ACTION) && StringUtils.equals(ToolAccessMode.TEACHER.toString(), modeStr)) {
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u -raabcbb2d7039738731a29bdcb6ec2089f3804e72 -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision aabcbb2d7039738731a29bdcb6ec2089f3804e72)
+++ lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -3,17 +3,30 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c" %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
 		"http://www.w3.org/TR/html4/loose.dtd">
 
 <lams:html>
 <lams:head>
+	<c:remove var="notifyCloseURL" scope="session" />
+	       	
 	<lams:css />
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
 	<script type="text/javascript">
 		function closeWindow() {
-			refreshParentMonitoringWindow();
+			var notifyCloseURL = "${param.notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				refreshParentMonitoringWindow();
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+			
 
 			//just for depress alert window when call window.close()
 			//only available for IE browser			  
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
@@ -90,4 +103,4 @@
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -1,93 +1,106 @@
-<% 
-/****************************************************************
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * 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="contentFolderID" 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" %>
-<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
-<%@ attribute name="customiseSessionID" 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}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
-	}
-    function doSubmit_Form_Only() {
-    	document.getElementById("${formID}").submit();
-    }
-    function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
-        	//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 id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
-			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-</p>
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * 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="contentFolderID" 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" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
+<%@ attribute name="customiseSessionID" 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>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</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}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
+	}
+    function doSubmit_Form_Only() {
+    	document.getElementById("${formID}").submit();
+    }
+    function doCancel() {
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
+        	//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 id="saveCancelButtons" >
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
+		</html:link>
+</p>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_openid/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r577361b2f9a829e73591c4594a943fc5ef77b2ef -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_openid/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 577361b2f9a829e73591c4594a943fc5ef77b2ef)
+++ lams_openid/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
@@ -84,10 +97,10 @@
 </script>	
 <p id="saveCancelButtons" >
 		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<fmt:message key="${cancelButtonLabelKey}" />
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
 		</html:link>
 		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
-			<fmt:message key="${saveButtonLabelKey}" /> 
+			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,27 +61,31 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
-<c:set var="unableToSaveMsgKey" value="authoring.msg.one.question.to.be.saved" scope="request"/>
-
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
-    	var length = $('#questionTable tr').size();
-
-		if( length <= 1 ) {
-        	alert("<fmt:message key='${unableToSaveMsgKey}'/>")
-		} else {
-	    	$("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
-	    	document.getElementById("${formID}").submit();
-		}
+    	document.getElementById("${formID}").submit();
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision cd0d0b28a7c27711a74ce2b41821f3ccf5c80df9)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -33,6 +33,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.Map.Entry;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -101,7 +102,6 @@
     @Override
     protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
-
 	// Extract toolContentID from parameters.
 	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -50,17 +50,20 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
-	<c:set var="cancelButtonLabelKey" value="label.common.cancel" scope="request"/>
+	<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="message.authoring.cancel.save" scope="request"/>
+	<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>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
@@ -90,4 +103,4 @@
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,23 +61,31 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</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}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
-    	var save = serialiseMarkers();
-    	if (save)
-    	{
-    		saveMapState();
-    		document.getElementById("${formID}").submit();
-    	}
+    	document.getElementById("${formID}").submit();
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
@@ -95,4 +103,4 @@
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,34 +61,46 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</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}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
-    	setMindmapContent();
     	document.getElementById("${formID}").submit();
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")) {
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//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>
+    }  				
+</script>	
 <p id="saveCancelButtons" >
 		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<fmt:message key="${cancelButtonLabelKey}" />
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
 		</html:link>
 		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
-			<fmt:message key="${saveButtonLabelKey}" /> 
+			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -1,93 +1,106 @@
-<% 
-/****************************************************************
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * 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="contentFolderID" 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" %>
-<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
-<%@ attribute name="customiseSessionID" 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}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
-	}
-    function doSubmit_Form_Only() {
-    	document.getElementById("${formID}").submit();
-    }
-    function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
-        	//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 id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
-			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-</p>
+<% 
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * 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="contentFolderID" 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" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
+<%@ attribute name="customiseSessionID" 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>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</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}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
+	}
+    function doSubmit_Form_Only() {
+    	document.getElementById("${formID}").submit();
+    }
+    function doCancel() {
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
+        	//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 id="saveCancelButtons" >
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
+		</html:link>
+</p>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,20 +61,31 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</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}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
-    	var code = window.frames["externalSpreadsheet"].cellsToJS();
-    	document.getElementById("spreadsheet.code").value = code;
     	document.getElementById("${formID}").submit();
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,28 +61,31 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
-<c:set var="saveUnableMsgKey" value="authoring.msg.no.tasks.save" scope="request"/>
-
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
-        	var table = document.getElementById("itemTable");
-    	var length2 = table.rows;
-    	var length = length2.length;
-
-		if( length == 0 ) {
-        	alert("<fmt:message key='${saveUnableMsgKey}'/>")
-		} else {
-	        document.getElementById("${formID}").submit();    		
-		}
+    	document.getElementById("${formID}").submit();
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -r08c8692f524c39ab604743ce30e48c685bbf2005
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;