Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rd646d3d1075cb13b89a87c07a118422112995162
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision d646d3d1075cb13b89a87c07a118422112995162)
@@ -82,19 +82,14 @@
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 	String action = request.getParameter(ACTION_NAME);
-	String modeStr = request.getParameter(ACTION_MODE);
+	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, ACTION_MODE, false);
 	String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID);
 	String notifyCloseURL = (String) request.getSession().getAttribute(PARAM_NOTIFY_CLOSE_URL);
 	
 	// clear session according to the ToolAccessMode.
-	if (StringUtils.equals(ToolAccessMode.LEARNER.toString(), modeStr))
-	    clearSession(cSessionID, request.getSession(), ToolAccessMode.LEARNER);
-	else if (StringUtils.equals(ToolAccessMode.TEACHER.toString(), modeStr))
-	    clearSession(cSessionID, request.getSession(), ToolAccessMode.TEACHER);
-	else
-	    // if(StringUtils.equals(ToolAccessMode.AUTHOR.toString(),modeStr)) : default value
-	    clearSession(cSessionID, request.getSession(), ToolAccessMode.AUTHOR);
+	clearSession(cSessionID, request.getSession(), mode);
 
+	//CONFIRM_ACTION got fired only for general authoring and not for define later one
 	if (StringUtils.equals(action, CONFIRM_ACTION)) {
 	    String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
 	    String signature = request.getParameter(TOOL_SIGNATURE);
@@ -105,32 +100,19 @@
 
 	    // check whether it use on define it later page
 	    IToolVO tool = getToolService().getToolBySignature(signature);
-	    String defineLater = request.getParameter(PARAM_DEFINE_LATER);
 
-	    String reeditUrl;
-	    if (StringUtils.equalsIgnoreCase(defineLater, "yes") || StringUtils.equalsIgnoreCase(defineLater, "true")) {
-		// define it later page
-		reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getDefineLaterUrl(),
-			AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString());
-		reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
-			contentFolderID);
-
-	    } else {
-		// authoring page
-		reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getAuthorUrl(),
-			AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString());
-		reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
-			contentFolderID);
-	    }
-	    tool.getServiceName();
+	    //add reeditUrl parameter
+	    String reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getAuthorUrl(),
+		    AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString());
+	    reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
 	    nextUrl = WebUtil.appendParameterToURL(nextUrl, RE_EDIT_URL, URLEncoder.encode(reeditUrl, "UTF-8"));
 
 	    if (!StringUtils.isBlank(notifyCloseURL)) {
 		nextUrl = WebUtil.appendParameterToURL(nextUrl, PARAM_NOTIFY_CLOSE_URL, notifyCloseURL);
 	    }
 	    response.sendRedirect(nextUrl);
 	}
-	if (StringUtils.equals(action, CANCEL_ACTION) && StringUtils.equals(ToolAccessMode.TEACHER.toString(), modeStr)) {
+	if (StringUtils.equals(action, CANCEL_ACTION) && mode.isTeacher()) {
 	    String signature = request.getParameter(TOOL_SIGNATURE);
 	    Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r08c8692f524c39ab604743ce30e48c685bbf2005 -rd646d3d1075cb13b89a87c07a118422112995162
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 08c8692f524c39ab604743ce30e48c685bbf2005)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d646d3d1075cb13b89a87c07a118422112995162)
@@ -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,54 @@
 	<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") {
+				alert(notifyCloseURL);
+				refreshParentMonitoringWindow();
+				alert(nextAction);
+			}
+			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">