Index: lams_tool_bbb/.classpath
===================================================================
diff -u -r42a8e60ac650faffecc0199c639205f525c59a9e -r36b8c6add495d29cb4552ddd96ad7758bb8d118a
--- lams_tool_bbb/.classpath	(.../.classpath)	(revision 42a8e60ac650faffecc0199c639205f525c59a9e)
+++ lams_tool_bbb/.classpath	(.../.classpath)	(revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE13_CONTAINER"/>
Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r0bb543134937df6708d57f352dde50c6e1c16735 -r36b8c6add495d29cb4552ddd96ad7758bb8d118a
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
@@ -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_eadventure/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d -r36b8c6add495d29cb4552ddd96ad7758bb8d118a
--- lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d)
+++ lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
@@ -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_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d -r36b8c6add495d29cb4552ddd96ad7758bb8d118a
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
@@ -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_wookie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r0bb543134937df6708d57f352dde50c6e1c16735 -r36b8c6add495d29cb4552ddd96ad7758bb8d118a
--- lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
+++ lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
@@ -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">