Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u -r50d68fddcd33b33903cd4c0119f01080b9314b80 -re3c0c732e8418ab2338465e08ff3e77a5f5a9252
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision e3c0c732e8418ab2338465e08ff3e77a5f5a9252)
@@ -69,6 +69,7 @@
 
 	private static final String RE_EDIT_URL = "reEditUrl";
 
+	private static final String PARAM_DEFINE_LATER = "defineLater";
 	
 	/**
 	 * Action method, will handle save/cancel action.
@@ -83,16 +84,27 @@
 			clearSession(request.getSession(),ToolAccessMode.LEARNER);
 		if(StringUtils.equals(ToolAccessMode.TEACHER.toString(),modeStr))
 			clearSession(request.getSession(),ToolAccessMode.TEACHER);
-			
 		if(StringUtils.equals(action,CONFIRM_ACTION)){
 			String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
-			
 			String signature = request.getParameter(TOOL_SIGNATURE);
 			Long toolContentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+
+			//check whether it use on define it later page
 			IToolVO tool = getToolService().getToolBySignature(signature);
-			String reeditUrl = WebUtil.appendParameterToURL(getLamsUrl()+tool.getAuthorUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID,
-					toolContentId.toString());
+			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());
+			}else{
+				//authoring page
+				reeditUrl = WebUtil.appendParameterToURL(getLamsUrl()+tool.getAuthorUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID,
+						toolContentId.toString());
+			}
+			
 			nextUrl = WebUtil.appendParameterToURL(nextUrl,RE_EDIT_URL,URLEncoder.encode(reeditUrl,"UTF-8"));
 			response.sendRedirect(nextUrl);
 		}
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r2b3d7902eba19ec19df28ddfdab299f6a794d15b -re3c0c732e8418ab2338465e08ff3e77a5f5a9252
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2b3d7902eba19ec19df28ddfdab299f6a794d15b)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision e3c0c732e8418ab2338465e08ff3e77a5f5a9252)
@@ -44,6 +44,7 @@
 <%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="false" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
@@ -62,22 +63,22 @@
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}'/>";
+	}
+    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}'/>";
+        	//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();
 		}
-        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}'/>";
-	        	//just for depress alert window when call window.close()
-	        	//only available for IE browser
-	        	var userAgent=navigator.userAgent;
-	        	if(userAgent.indexOf('MSIE') != -1)
-		        	window.opener = "authoring"
-	        	window.close();
-			}
-        }  				
+    }  				
 </script>				
 <p align="right">
 	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">