Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r2b3d7902eba19ec19df28ddfdab299f6a794d15b -ra90b70eb1ae90fb0c93a3b4042dabe2f7dd498ee
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2b3d7902eba19ec19df28ddfdab299f6a794d15b)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a90b70eb1ae90fb0c93a3b4042dabe2f7dd498ee)
@@ -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">
Index: lams_tool_larsrc/web/pages/authoring/definelater.jsp
===================================================================
diff -u -r00546fef27c802810d1b2ac3d621f9c3e2d64cb0 -ra90b70eb1ae90fb0c93a3b4042dabe2f7dd498ee
--- lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision 00546fef27c802810d1b2ac3d621f9c3e2d64cb0)
+++ lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision a90b70eb1ae90fb0c93a3b4042dabe2f7dd498ee)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp" %>
 <%@ page import="java.util.HashSet" %>
+<%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%>
 <%@ page import="java.util.Set" %>
     <% 
     	
@@ -83,17 +84,17 @@
 <!-- end of content (Basic) -->
       
 
-<!-- Button Row -->
-		<p align="right">
-			<html:link href="javascript:doSubmit();" property="submit" styleClass="button">
-				<fmt:message key="label.authoring.save.button" />
-			</html:link>
-			<html:link href="javascript:;" property="cancel" onclick="window.close()" styleClass="button">
-				<fmt:message key="label.authoring.cancel.button" />
-			</html:link>
-		</p>
-</div>
+	<!-- Button Row -->
+	<%--  Default value 
+		cancelButtonLabelKey="label.authoring.cancel.button"
+		saveButtonLabelKey="label.authoring.save.button"
+		cancelConfirmMsgKey="authoring.msg.cancel.save"
+		accessMode="author"
+	--%>
+	<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" defineLater="yes"/>
+
 <lams:HTMLEditor/>
+</div>
 	
 
 </html:form>