Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+		
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,34 +66,51 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+		
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
+    	
+    	//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" >
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+		
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,34 +66,51 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
+    	
+    	//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" >
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -67,17 +68,29 @@
 
 <c:set var="unableToSaveMsgKey" value="authoring.msg.one.question.to.be.saved" scope="request"/>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
+		}
 	}
     function doSubmit_Form_Only() {
     	var amountOfQuestions = $('#questionTable tr').size();
     	var amountOfReferences = $('#referencesTable tr').size();
 
 		if( amountOfQuestions <= 1 ) {
-        	alert("<fmt:message key='${unableToSaveMsgKey}'/>");
+			$("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
+	    	document.getElementById("${formID}").submit();
 		} else if (amountOfReferences > amountOfQuestions) {
 			alert("<fmt:message key='label.authoring.basic.warning.too.many.questions'/>");
 		} else {
@@ -87,25 +100,31 @@
     }
     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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,34 +66,51 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
+    	
+    	//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" >
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+	    	closeWindow("cancel");
+	    }
+	}
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }  	
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,34 +66,51 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
+    	
+    	//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" >
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,34 +66,51 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
+    	
+    	//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" >
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    } 
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,34 +66,51 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
+    	
+    	//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" >
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }  
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,34 +66,51 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
+    	
+    	//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" >
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    } 
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -65,35 +66,52 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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}'/>";
+    		closeWindow("cancel");
+    	}
+    } 
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		} else {
+			if (window.parent.opener == null){
+				window.location.href = notifyCloseURL;
 			} else {
-				if (window.parent.opener == null){
-					window.location.href = notifyCloseURL;
-				} else {
-					window.parent.opener.location.href = notifyCloseURL;
-				}
+				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();
 		}
-    }  				
+    	
+    	//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">
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra7dbc1261f766307539edfdf26ec2a09903bb53e -rf98861f7614ec6d2fd3020dcafa867e479ee018a
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -62,25 +63,52 @@
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
 
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+	
 <!-- begin tab content -->
 <script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	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}'/>";
+		
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&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();
+    		closeWindow("cancel");
 		}
-    }  				
+    }
+    function closeWindow(nextAction) {
+		var notifyCloseURL = "${notifyCloseURL}";
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			location.href="<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&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">