Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.32 -r1.33
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	13 Jun 2006 06:26:23 -0000	1.32
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	13 Jun 2006 07:28:00 -0000	1.33
@@ -170,6 +170,10 @@
 			return mapping.findForward("error");
 		}
 		
+		boolean lock = session.getForum().getLockWhenFinished();
+		lock = lock && (session.getStatus() == ForumConstants.SESSION_STATUS_FINISHED ? true : false);
+		request.getSession().setAttribute(ForumConstants.FINISHEDLOCK, new Boolean(lock));
+		
 		Forum forum = session.getForum();
 		//add define later support
 		if(forum.isDefineLater()){
@@ -190,12 +194,7 @@
 				allowRichEditor);
 		request.getSession().setAttribute(ForumConstants.LIMITED_CHARS,
 				new Integer(allowNumber));
-		boolean lock = session.getForum().getLockWhenFinished();
-		lock = lock
-				&& (session.getStatus() == ForumConstants.SESSION_STATUS_FINISHED ? true
-						: false);
-		request.getSession().setAttribute(ForumConstants.FINISHEDLOCK,
-				new Boolean(lock));
+		
 
 		// get all root topic to display on init page
 		List rootTopics = forumService.getRootTopics(sessionId);
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/Attic/runoffline.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	8 Jun 2006 07:37:33 -0000	1.1
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	13 Jun 2006 07:28:00 -0000	1.2
@@ -1,5 +1,13 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
 <div align="center">
-	<fmt:message key="run.offline.message"/>
+	<h2><fmt:message key="run.offline.message" /></h2>
+	<p>
+	<c:set var="finish">
+		<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
+	</c:set>
+	
+	<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${finishedLock}" style="width:120px" styleClass="buttonStyle">
+		<fmt:message key="label.finish" />
+	</html:button>
 </div>
Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.20 -r1.21
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	17 May 2006 06:55:32 -0000	1.20
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	13 Jun 2006 07:26:59 -0000	1.21
@@ -177,3 +177,8 @@
 label.hide=Hide
 label.save=Save
 label.cancel=Cancel
+
+
+#======= New labels: after 08/06/2006 =============
+define.later.message=Please wait for the teacher to define this part.
+run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-actions.xml,v
diff -u -r1.24 -r1.25
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	18 May 2006 06:39:06 -0000	1.24
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	13 Jun 2006 07:26:59 -0000	1.25
@@ -14,6 +14,7 @@
 			scope="session" 
 			parameter="definelater" 
 			validate="false">
+			<forward name="forbidden" path="/pages/authoring/definelaterforbid.jsp" />
 			<forward name="success" path="/pages/authoring/start.jsp" />
 		</action>
 		<action path="/authoring/init"
@@ -143,6 +144,8 @@
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			parameter="start" >
 			<forward name="success" path="/pages/learning/start.jsp" />
+			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
+			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
 		</action>
 		<action path="/learning/completeItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	17 May 2006 06:55:32 -0000	1.9
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	13 Jun 2006 07:27:00 -0000	1.10
@@ -106,5 +106,5 @@
 
 
 INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`, `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`) VALUES
-  (2,NULL,NULL,NULL,'LAMS Shared Resources','0','0','Instruction','Online instruction','Offline instruction',0,1,${default_content_id},1,1,1,1);
+  (2,NULL,NULL,NULL,'Shared Resources','0','0','Instruction','Online instruction','Offline instruction',0,0,${default_content_id},1,1,1,1);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v
diff -u -r1.20 -r1.21
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	18 May 2006 06:39:06 -0000	1.20
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	13 Jun 2006 07:27:00 -0000	1.21
@@ -48,6 +48,7 @@
 	public static final String PARAM_ITEM_INDEX = "itemIndex";
 	public static final String PARAM_RESOURCE_ITEM_UID = "itemUid";
 	public static final String PARAM_CURRENT_INSTRUCTION_INDEX = "insIdx";
+	public static final String PARAM_RUN_OFFLINE = "runOffline";
 	
 	//for request attribute name
 	public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java	13 Jun 2006 07:27:00 -0000	1.1
@@ -0,0 +1,55 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */	
+package org.lamsfoundation.lams.tool.rsrc.util;
+
+import org.lamsfoundation.lams.tool.rsrc.model.Resource;
+import org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction;
+
+
+
+/**
+ * Contains helper methods used by the Action Servlets
+ * 
+ * @author Anthony Sukkar
+ *
+ */
+public class ResourceWebUtils {
+
+	public static boolean isResourceEditable(Resource resource) {
+	        if ( (resource.isDefineLater() == true) && (resource.isContentInUse()==true) )
+	        {
+	//            throw new ResourceApplicationException("An exception has occurred: There is a bug in this tool, conflicting flags are set");
+	        	 MonitoringAction.log.error("An exception has occurred: There is a bug in this tool, conflicting flags are set");
+	             return false;
+	        }
+	        else if ( (resource.isDefineLater() == true) && (resource.isContentInUse() == false))
+	            return true;
+	        else if ( (resource.isDefineLater() == false) && (resource.isContentInUse() == false))
+	            return true;
+	        else //  (content.isContentInUse()==true && content.isDefineLater() == false)
+	            return false;
+		}
+	
+}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.25 -r1.26
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	18 May 2006 06:39:06 -0000	1.25
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	13 Jun 2006 07:26:59 -0000	1.26
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.tool.rsrc.web.action;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.sql.Timestamp;
@@ -59,7 +58,6 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
-import org.lamsfoundation.lams.tool.rsrc.dto.InstructionNavDTO;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
@@ -68,6 +66,7 @@
 import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
 import org.lamsfoundation.lams.tool.rsrc.service.ResourceApplicationException;
 import org.lamsfoundation.lams.tool.rsrc.service.UploadResourceFileException;
+import org.lamsfoundation.lams.tool.rsrc.util.ResourceWebUtils;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceForm;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceItemForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -100,7 +99,23 @@
 			return start(mapping, form, request, response);
 		}
 		if (param.equals("definelater")) {
+			//update define later flag to true
 			request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER);
+			Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+			IResourceService service = getResourceService();
+			Resource resource = service.getResourceByContentId(contentId);
+			
+			boolean isEditable = ResourceWebUtils.isResourceEditable(resource);
+			if(!isEditable){
+				request.setAttribute(ResourceConstants.PAGE_EDITABLE, new Boolean(isEditable));
+				return mapping.findForward("forbidden");
+			}
+			
+			if(!resource.isContentInUse()){
+				resource.setDefineLater(true);
+				service.saveOrUpdateResource(resource);
+			}
+			
 			return start(mapping, form, request, response);
 		}		
 	  	if (param.equals("initPage")) {
@@ -429,6 +444,7 @@
 				}else{ //if it is Teacher, then just update basic tab content (definelater)
 					resourcePO.setInstructions(resource.getInstructions());
 					resourcePO.setTitle(resource.getTitle());
+					resourcePO.setDefineLater(false);
 				}
 				resourcePO.setUpdated(new Timestamp(new Date().getTime()));
 			}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v
diff -u -r1.10 -r1.11
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	18 May 2006 06:39:06 -0000	1.10
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	13 Jun 2006 07:26:59 -0000	1.11
@@ -40,7 +40,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -97,11 +96,13 @@
 	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		//auto run mode, when use finish the only one resource item, mark it as complete then finish this activity as well.
 		String resourceItemUid = request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID);
+		String runOffline = request.getParameter(ResourceConstants.PARAM_RUN_OFFLINE);
 		if(resourceItemUid != null){
 			doComplete(request);
 			request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,true);
 		}else
 			request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,false);
+		
 		Long sessionId = (Long) request.getSession().getAttribute(
 				AttributeNames.PARAM_TOOL_SESSION_ID);
 		HttpSession ss = SessionManager.getSession();
@@ -111,7 +112,8 @@
 		IResourceService service = getResourceService();
 		int miniViewFlag = service.checkMiniView(sessionId,userID);
 		//if current user view less than reqired view count number, then just return error message.
-		if(miniViewFlag > 0){
+		//if it is runOffline content, then need not check minimum view count
+		if(miniViewFlag > 0 && !StringUtils.equalsIgnoreCase(runOffline,"true")){
 			ActionErrors errors = new ActionErrors();
 			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("lable.learning.minimum.view.number.less",miniViewFlag));
 			this.addErrors(request,errors);
@@ -243,6 +245,16 @@
 			log.error(e);
 			return mapping.findForward(ResourceConstants.ERROR);
 		}
+		
+		//add define later support
+		if(resource.isDefineLater()){
+			return mapping.findForward("defineLater");
+		}
+		//add run offline support
+		if(resource.getRunOffline()){
+			return mapping.findForward("runOffline");
+		}
+				
 		//init resource item list
 		List<ResourceItem> resourceItemList = getResourceItemList(request);
 		resourceItemList.clear();
@@ -276,6 +288,11 @@
 		}
 		request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,new Boolean(runAuto));
 		
+		//set contentInUse flag to true!
+		resource.setContentInUse(true);
+		resource.setDefineLater(false);
+		service.saveOrUpdateResource(resource);
+		
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 	//*************************************************************************************
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	17 May 2006 06:55:32 -0000	1.7
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	13 Jun 2006 07:26:59 -0000	1.8
@@ -42,6 +42,7 @@
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
 import org.lamsfoundation.lams.tool.rsrc.service.ResourceApplicationException;
+import org.lamsfoundation.lams.tool.rsrc.util.ResourceWebUtils;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -50,7 +51,7 @@
 import sun.util.logging.resources.logging;
 
 public class MonitoringAction extends Action {
-	private static Logger log = Logger.getLogger(MonitoringAction.class);
+	public static Logger log = Logger.getLogger(MonitoringAction.class);
 	
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws IOException, ServletException {
@@ -130,7 +131,7 @@
 		
 		Resource resource = service.getResourceByContentId(contentId);
 		resource.toDTO();
-		request.getSession().setAttribute(ResourceConstants.PAGE_EDITABLE, new Boolean(isResourceEditable(resource)));
+		request.getSession().setAttribute(ResourceConstants.PAGE_EDITABLE, new Boolean(ResourceWebUtils.isResourceEditable(resource)));
 		request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE, resource);
 		request.getSession().setAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId);
 		return mapping.findForward(ResourceConstants.SUCCESS);
@@ -157,20 +158,5 @@
 		WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
 				.getServletContext());
 		return (IResourceService) wac.getBean(ResourceConstants.RESOURCE_SERVICE);
-	}
-	
-	private boolean isResourceEditable(Resource resource) {
-        if ( (resource.isDefineLater() == true) && (resource.isContentInUse()==true) )
-        {
-//            throw new ResourceApplicationException("An exception has occurred: There is a bug in this tool, conflicting flags are set");
-        	 log.error("An exception has occurred: There is a bug in this tool, conflicting flags are set");
-             return false;
-        }
-        else if ( (resource.isDefineLater() == true) && (resource.isContentInUse() == false))
-            return true;
-        else if ( (resource.isDefineLater() == false) && (resource.isContentInUse() == false))
-            return true;
-        else //  (content.isContentInUse()==true && content.isDefineLater() == false)
-            return false;
 	}	
 }
Index: lams_tool_larsrc/web/pages/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/definelater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/web/pages/authoring/definelater.jsp	5 Jun 2006 15:40:57 -0000	1.2
+++ lams_tool_larsrc/web/pages/authoring/definelater.jsp	13 Jun 2006 07:26:59 -0000	1.3
@@ -1,36 +1,30 @@
-<%@ include file="/common/taglibs.jsp" %>
-<%@ page import="java.util.HashSet" %>
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page import="java.util.HashSet"%>
 <%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%>
-<%@ page import="java.util.Set" %>
-    <% 
-    	
-		Set tabs = new HashSet();
-		tabs.add("label.authoring.heading.basic");
-		pageContext.setAttribute("tabs", tabs);
-		
-	%>
+<%@ page import="java.util.Set"%>
+<%Set tabs = new HashSet();
+			tabs.add("label.authoring.heading.basic");
+			pageContext.setAttribute("tabs", tabs);
+
+			%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
 <head>
-	<title><fmt:message key="label.author.title"/></title>
-	
-    <%@ include file="/common/header.jsp" %>
-    <%@ include file="/common/fckeditorheader.jsp" %>
+	<title><fmt:message key="label.author.title" /></title>
+
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
+
+	<script>
     
-    <script>
-    
     	var imgRoot="${lams}images/";
 	    var themeName="aqua";
         
         function init(){
         
-            initTabSize(3);
+            initTabSize(1);
             
-            var tag = document.getElementById("currentTab");
-	    	if(tag.value != "")
-	    		selectTab(tag.value);
-            else
-                selectTab(1); //select the default tab;
+            selectTab(1); //select the default tab;
             
             initEditor("Title");
             initEditor("Instructions");
@@ -53,50 +47,36 @@
 
         
     </script>
-    <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-    
-    
+	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+
+
 </head>
 <body onLoad="init()">
 
-<html:form action="authoring/update" method="post" styleId="authoringForm"
-	focus="resource.title"  enctype="multipart/form-data">
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="toolContentID"/>
-		<html:hidden property="currentTab" styleId="currentTab" />
+	<html:form action="authoring/update" method="post" styleId="authoringForm" focus="resource.title" enctype="multipart/form-data">
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<html:hidden property="toolContentID" />
 
-<h1><fmt:message key="label.authoring.heading" /></h1>
+		<h1>
+			<fmt:message key="label.authoring.heading" />
+		</h1>
 
-<!-- start tabs -->
-<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
-<!-- end tab buttons -->
-<div class="tabbody">
-<table align=center> 	  
-				<tr>   
-				<td NOWRAP>
-						<%@ include file="/common/messages.jsp" %>
-				</td>
-				</tr> 
-</table>
+		<!-- start tabs -->
+		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
+		<!-- end tab buttons -->
+		<div class="tabbody">
+			<!-- tab content 1 (Basic) -->
+			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+			<!-- end of content (Basic) -->
 
-<!-- tab content 1 (Basic) -->
-<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp"/>
-<!-- end of content (Basic) -->
-      
 
-	<!-- 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"/>
+			<!-- Button Row -->
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" defineLater="yes" />
 
-<lams:HTMLEditor/>
-</div>
-	
+			<lams:HTMLEditor />
+		</div>
 
-</html:form>
+
+	</html:form>
 </body>
 </html:html>
Index: lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp	13 Jun 2006 07:26:59 -0000	1.1
@@ -0,0 +1,4 @@
+<%@ include file="/common/taglibs.jsp"%>
+<div align="center">
+	<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
+</div>
Index: lams_tool_larsrc/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/definelater.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/learning/definelater.jsp	13 Jun 2006 07:26:59 -0000	1.1
@@ -0,0 +1,17 @@
+<%@include file="/common/taglibs.jsp"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+	<%@ include file="/common/header.jsp"%>
+
+</head>
+
+<body>
+	<div align="center">
+		<h2>
+			<fmt:message key="define.later.message" />
+		</h2>
+	</div>
+
+</body>
+</html:html>
Index: lams_tool_larsrc/web/pages/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/Attic/runoffline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/learning/runoffline.jsp	13 Jun 2006 07:26:59 -0000	1.1
@@ -0,0 +1,31 @@
+<%@include file="/common/taglibs.jsp"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+	<%@ include file="/common/header.jsp"%>
+
+	<script type="text/javascript">
+	<!--
+		function finishSession(){
+			document.location.href ='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&runOffline=true"/>';
+			return false;
+		}
+	-->        
+    </script>
+</head>
+
+<body>
+	<h1>
+		${resource.title}
+	</h1>
+	<div align="center">
+		<h2>
+			<fmt:message key="run.offline.message" />
+		</h2>
+		<p>
+		<a href="#" class="button" onclick="return finishSession()"> <fmt:message key="label.finished" /> </a>
+	</div>
+
+
+</body>
+</html:html>
Index: lams_tool_sbmt/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/conf/language/ApplicationResources.properties	12 May 2006 06:34:09 -0000	1.4
+++ lams_tool_sbmt/conf/language/ApplicationResources.properties	13 Jun 2006 07:27:25 -0000	1.5
@@ -100,4 +100,9 @@
 #======= End labels: Exported 89 labels for en AU =====
 
 #======== New label since 12/05/2006 =========
-authoring.msg.cancel.save=Do you want to close this window without saving?
\ No newline at end of file
+authoring.msg.cancel.save=Do you want to close this window without saving?
+
+#======= New labels: after 08/06/2006 =============
+define.later.message=Please wait for the teacher to define this part.
+run.offline.message=This activity is not being done on the computer. Please see your instructor for details.
+message.monitoring.edit.activity.not.editable=This Activity is no longer editable
\ No newline at end of file
Index: lams_tool_sbmt/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/struts-actions.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/conf/xdoclet/struts-actions.xml	12 May 2006 06:34:09 -0000	1.2
+++ lams_tool_sbmt/conf/xdoclet/struts-actions.xml	13 Jun 2006 07:27:25 -0000	1.3
@@ -1,18 +1,18 @@
 		<!-- ========== Action Mapping Definitions ============================== -->
 		<action path="/definelater"
-			type="org.lamsfoundation.lams.tool.sbmt.web.MonitoringAction"
+			type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction"
 			name="emptyForm" 
 			scope="request" 
 			parameter="method" 
 			validate="false">
 			      <forward
 			        name="definelater"
-			        path="/monitoring/definelater.jsp"
+			        path="/authoring/definelater.jsp"
 			        redirect="false"
 			      />
 			      <forward
-			        name="definelatersuccess"
-			        path="/monitoring/definelater.jsp"
+			        name="forbidden"
+			        path="/authoring/definelaterforbid.jsp"
 			        redirect="false"
 			      />
 		</action>
Index: lams_tool_sbmt/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/tool_insert.sql,v
diff -u -r1.16 -r1.17
--- lams_tool_sbmt/db/sql/tool_insert.sql	10 Apr 2006 11:11:07 -0000	1.16
+++ lams_tool_sbmt/db/sql/tool_insert.sql	13 Jun 2006 07:27:25 -0000	1.17
@@ -44,7 +44,7 @@
 'tool/lasbmt11/learner.do?mode=teacher',
 'tool/lasbmt11/authoring.do',
 'tool/lasbmt11/monitoring.do',
-'tool/lasbmt11/definelater.do?method=editActivity&mode=definelater',
+'tool/lasbmt11/definelater.do?mode=teacher',
 'tool/lasbmt11/exportPortfolio?mode=learner',
 'tool/lasbmt11/exportPortfolio?mode=teacher',
 'tool/lasbmt11/contribute.do',
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.49 -r1.50
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	7 Jun 2006 06:08:28 -0000	1.49
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	13 Jun 2006 07:27:25 -0000	1.50
@@ -165,7 +165,7 @@
 	 */
 	private SubmitFilesContent duplicateDefaultToolContent(Long toolContentId) {
 		long contentId=0;
-		contentId =toolService.getToolDefaultContentIdBySignature(SbmtConstants.TOOLSIGNNATURE);
+		contentId =toolService.getToolDefaultContentIdBySignature(SbmtConstants.TOOL_SIGNATURE);
 		SubmitFilesContent content = new SubmitFilesContent();
 		content.setContentID(new Long(contentId));
 		return content;
@@ -739,7 +739,7 @@
     	    log.error(error);
     	    throw new SubmitFilesException(error);
     	}
-    	Long defaultToolContentId = getToolDefaultContentIdBySignature(SbmtConstants.TOOLSIGNNATURE);
+    	Long defaultToolContentId = getToolDefaultContentIdBySignature(SbmtConstants.TOOL_SIGNATURE);
     	SubmitFilesContent defaultContent = getSubmitFilesContent(defaultToolContentId);
     	if(defaultContent == null)
     	{
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v
diff -u -r1.11 -r1.12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	6 Apr 2006 06:41:33 -0000	1.11
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	13 Jun 2006 07:27:25 -0000	1.12
@@ -27,7 +27,7 @@
 
 public class SbmtConstants {
 
-	public static final String TOOLSIGNNATURE = "lasbmt11";
+	public static final String TOOL_SIGNATURE = "lasbmt11";
 	public static final String DEFAULT_TITLE = "Submit Files Title";
 
 	public static final String AUTHORING_DTO = "authoring";
@@ -41,4 +41,5 @@
 	public static final String ATTACHMENT_LIST = "attachmentList";
 	public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
 	public static final String READ_ONLY_MODE = "readOnlyMode";
+	public static final String PAGE_EDITABLE = "isPageEditable";
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/Attic/SbmtWebUtils.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java	13 Jun 2006 07:27:25 -0000	1.1
@@ -0,0 +1,53 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */	
+package org.lamsfoundation.lams.tool.sbmt.util;
+
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
+import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
+
+
+/**
+ * Contains helper methods used by the Action Servlets
+ * 
+ * @author Anthony Sukkar
+ *
+ */
+public class SbmtWebUtils {
+
+	public static boolean isSbmtEditable(SubmitFilesContent submitContent) {
+        if ( (submitContent.isDefineLater() == true) && (submitContent.isContentInUse()==true) )
+        {
+            throw new SubmitFilesException("An exception has occurred: There is a bug in this tool, conflicting flags are set");
+                    //return false;
+        }
+        else if ( (submitContent.isDefineLater() == true) && (submitContent.isContentInUse() == false))
+            return true;
+        else if ( (submitContent.isDefineLater() == false) && (submitContent.isContentInUse() == false))
+            return true;
+        else //  (content.isContentInUse()==true && content.isDefineLater() == false)
+            return false;
+	}
+	
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v
diff -u -r1.20 -r1.21
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	19 May 2006 05:24:42 -0000	1.20
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	13 Jun 2006 07:27:25 -0000	1.21
@@ -46,15 +46,17 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
+import org.lamsfoundation.lams.tool.sbmt.util.SbmtWebUtils;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * @author Manpreet Minhas
@@ -90,6 +92,8 @@
 	public ActionForward updateContent(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
+		ToolAccessMode mode = getAccessMode(request);
+		
 		SubmitFilesContent content = getContent(form);
 		
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
@@ -144,7 +148,16 @@
 			content.setInstructionFiles(attPOSet);
 			content.setToolSession(persistContent.getToolSession());
 			//copy web page value into persist content, as above, the "Set" type value kept.
-			PropertyUtils.copyProperties(persistContent,content);
+			if(mode.isAuthor()){
+				Long uid = persistContent.getContentID();
+				PropertyUtils.copyProperties(persistContent,content);
+				persistContent.setContentID(uid);
+			}else{
+//				if it is Teacher, then just update basic tab content (definelater)
+				persistContent.setInstruction(content.getInstruction());
+				persistContent.setTitle(content.getTitle());
+				persistContent.setDefineLater(false);
+			}
 			
 			submitFilesService.saveOrUpdateContent(persistContent);
 			request.setAttribute("sbmtSuccess", new Boolean(true));
@@ -238,8 +251,10 @@
 
 	/**
 	 * This page will display initial submit tool content. Or just a blank page if the toolContentID does not
-	 * exist before. 
+	 * exist before.
 	 *  
+	 * <BR>
+	 * Define later will use this method to initial page as well. 
 	 * @see org.apache.struts.actions.DispatchAction#unspecified(org.apache.struts.action.ActionMapping,
 	 *      org.apache.struts.action.ActionForm,
 	 *      javax.servlet.http.HttpServletRequest,
@@ -248,13 +263,29 @@
 	protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
+		ToolAccessMode mode = getAccessMode(request);
+		
 		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		request.getSession().setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,contentID);
 		//get back the upload file list and display them on page
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
 				.getServlet().getServletContext());
 		
 		SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
+		
+		if(mode.isTeacher()){
+			boolean isForumEditable = SbmtWebUtils.isSbmtEditable(persistContent);
+			if(!isForumEditable){
+				request.setAttribute(SbmtConstants.PAGE_EDITABLE, new Boolean(isForumEditable));
+				return mapping.findForward("forbidden");
+			}
+			
+			if(!persistContent.isContentInUse()){
+				persistContent.setDefineLater(true);
+				submitFilesService.saveOrUpdateContent(persistContent);
+			}
+		}
+		
 		//if this content does not exist(empty without id), create a content by default content record.
 		if(persistContent == null){
 			persistContent = submitFilesService.createDefaultContent(contentID);
@@ -281,7 +312,7 @@
 		authForm.set("lockOnFinished",persistContent.isLockOnFinished()?"1":null);
 		return mapping.getInputForward();
 	}
-	
+
 	//***********************************************************
 	//  Private/protected methods
 	//***********************************************************
@@ -368,4 +399,19 @@
 		}
 		return list;
 	}
+	
+	/**
+	 * @param request
+	 * @return
+	 */
+	private ToolAccessMode getAccessMode(HttpServletRequest request) {
+		ToolAccessMode mode;
+		String modeStr = request.getParameter("mode");
+		if(StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.TEACHER.toString()))
+			mode = ToolAccessMode.TEACHER;
+		else
+			mode = ToolAccessMode.AUTHOR;
+		return mode;
+	}
+	
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.27 -r1.28
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	8 Jun 2006 00:59:19 -0000	1.27
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	13 Jun 2006 07:27:25 -0000	1.28
@@ -72,7 +72,9 @@
  * 			validate="false"
  * 
  * @struts.action-forward name="upload" path="/learner/sbmtLearner.jsp"
- * @struts.action-forward name="contentInUse" path="/learner/contentinuse.jsp"
+ * @struts.action-forward name="defineLater" path="/learner/definelater.jsp"
+ * @struts.action-forward name="runOffline" path="/learner/runoffline.jsp"
+
  * 
  */
 public class LearnerAction extends DispatchAction {
@@ -129,15 +131,28 @@
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 		SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
 		SubmitFilesContent content = session.getContent();
-		//if content in use, return special page.
-		if(content.isContentInUse())
-			return mapping.findForward("contentInUse");
+
 		
 		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 		Learner learner = submitFilesService.getLearner(sessionID,userID);
 		setLearnerDTO(request, sessionID,user,learner, content, filesUploaded);
 		//to avoid user without patience click "upload" button too fast
 		saveToken(request);
+		
+		//if content in use, return special page.
+		if(content.isDefineLater()){
+			return mapping.findForward("defineLater");
+		}
+		//add run offline support
+		if(content.isRunOffline()){
+			return mapping.findForward("runOffline");		
+		}
+		
+		//set contentInUse flag to true!
+		content.setContentInUse(true);
+		content.setDefineLater(false);
+		submitFilesService.saveOrUpdateContent(content);
+		
 		return mapping.getInputForward();
 		
 	}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v
diff -u -r1.28 -r1.29
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	6 Apr 2006 06:41:33 -0000	1.28
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	13 Jun 2006 07:27:25 -0000	1.29
@@ -43,24 +43,25 @@
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.Region;
 import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.DynaActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
-import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.SessionDTO;
+import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
+import org.lamsfoundation.lams.tool.sbmt.util.SbmtWebUtils;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /**
@@ -78,7 +79,6 @@
  * 
  * @struts.action-forward name="instructions" path="/monitoring/monitoring.jsp"
  * @struts.action-forward name="showActivity" path="/monitoring/monitoring.jsp"
- * @struts.action-forward name="editActivity" path="/monitoring/monitoring.jsp"
  * @struts.action-forward name="success" path="/monitoring/monitoring.jsp"
  * @struts.action-forward name="load" path="/monitoring/monitoring.jsp"
  * 
@@ -441,66 +441,6 @@
 		return mapping.findForward("showActivity");
 	}
 	/**
-	 * Provide editable page for activity. The information will be same with "Basic" tab in authoring page.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	public ActionForward editActivity(ActionMapping mapping,
-			   ActionForm form,
-			   HttpServletRequest request,
-			   HttpServletResponse response){
-		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-		getAuthoringActivity(contentID, request);
-		String mode = request.getParameter("mode");
-		
-		setTab(request);
-		
-		// do other tabs
-		doTabs(mapping, form, request, response);
-		
-		if(StringUtils.equals(mode,"definelater"))
-			return mapping.findForward("definelater");
-		else
-			return mapping.findForward("editActivity");
-	}
-	/**
-	 * Update activity to database. The information will be same with "Basic" tab in authoring page.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	public ActionForward updateActivity(ActionMapping mapping,
-			   ActionForm form,
-			   HttpServletRequest request,
-			   HttpServletResponse response){
-		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-		String title = WebUtil.readStrParam(request,"title");
-		String instructions = WebUtil.readStrParam(request,"instructions");
-
-		//get back the upload file list and display them on page
-		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
-				.getServlet().getServletContext());
-		SubmitFilesContent content = submitFilesService.getSubmitFilesContent(contentID);
-		content.setTitle(title);
-		content.setInstruction(instructions);
-		submitFilesService.saveOrUpdateContent(content);
-		
-		getAuthoringActivity(contentID, request);
-		setTab(request);
-		doTabs(mapping, form, request, response);
-		
-		String mode = request.getParameter("mode");
-		if(StringUtils.equals(mode,"definelater"))
-			return mapping.findForward("definelatersuccess");
-		else
-			return mapping.findForward("success");
-	}
-	/**
 	 * Provide statistic information. Includes:<br>
 	 * <li>Files not marked</li> 
 	 * <li>Files marked</li> 
@@ -576,6 +516,8 @@
 		persistContent.setContentID(contentID);
 		AuthoringDTO authorDto = new AuthoringDTO(persistContent);
 		request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto);
+		
+		request.setAttribute(SbmtConstants.PAGE_EDITABLE, new Boolean(SbmtWebUtils.isSbmtEditable(persistContent)));
 	}
 	private ISubmitFilesService getSubmitFilesService(){
 		return SubmitFilesServiceProxy
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.27 -r1.28
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	12 May 2006 06:34:09 -0000	1.27
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	13 Jun 2006 07:27:25 -0000	1.28
@@ -97,10 +97,15 @@
         redirect="false"
       />
       <forward
-        name="contentInUse"
-        path="/learner/contentinuse.jsp"
+        name="defineLater"
+        path="/learner/definelater.jsp"
         redirect="false"
       />
+      <forward
+        name="runOffline"
+        path="/learner/runoffline.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/monitoring"
@@ -142,11 +147,6 @@
         redirect="false"
       />
       <forward
-        name="editActivity"
-        path="/monitoring/monitoring.jsp"
-        redirect="false"
-      />
-      <forward
         name="success"
         path="/monitoring/monitoring.jsp"
         redirect="false"
@@ -194,19 +194,19 @@
 
    		<!-- ========== Action Mapping Definitions ============================== -->
 		<action path="/definelater"
-			type="org.lamsfoundation.lams.tool.sbmt.web.MonitoringAction"
+			type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction"
 			name="emptyForm" 
 			scope="request" 
 			parameter="method" 
 			validate="false">
 			      <forward
 			        name="definelater"
-			        path="/monitoring/definelater.jsp"
+			        path="/authoring/definelater.jsp"
 			        redirect="false"
 			      />
 			      <forward
-			        name="definelatersuccess"
-			        path="/monitoring/definelater.jsp"
+			        name="forbidden"
+			        path="/authoring/definelaterforbid.jsp"
 			        redirect="false"
 			      />
 		</action>
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_sbmt/web/authoring/authoring.jsp	19 May 2006 05:24:41 -0000	1.29
+++ lams_tool_sbmt/web/authoring/authoring.jsp	13 Jun 2006 07:27:25 -0000	1.30
@@ -1,5 +1,7 @@
 <%@include file="/common/taglibs.jsp"%>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
+
+<%@ page import="org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants"%>
 <%@ page import="java.util.HashSet"%>
 <%@ page import="java.util.Set"%>
 
@@ -107,7 +109,7 @@
 		cancelConfirmMsgKey="authoring.msg.cancel.save"
 		accessMode="author"
 	--%>
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lasbmt11" toolContentID="${toolContentID}" />
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${toolContentID}" />
 
 		</div>
 		<lams:HTMLEditor />
Index: lams_tool_sbmt/web/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/definelater.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/authoring/definelater.jsp	13 Jun 2006 07:27:25 -0000	1.1
@@ -0,0 +1,96 @@
+<%@include file="/common/taglibs.jsp"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+
+<%@ page import="org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants"%>
+<%@ page import="java.util.HashSet"%>
+<%@ page import="java.util.Set"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<%Set tabs = new HashSet();
+			tabs.add("label.authoring.heading.basic");
+			pageContext.setAttribute("tabs", tabs);
+
+			%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+	<lams:headItems />
+	<title><fmt:message key="activity.title" /></title>
+	<!-- this is the custom CSS for the tool -->
+	<link href="${tool}css/tool_custom.css" rel="stylesheet" type="text/css">
+
+	<script>
+    
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
+        
+        function init(){
+        
+            initTabSize(1);
+            
+            var tag = document.getElementById("currentTab");
+            selectTab(1); //select the default tab;
+            
+            initEditor("Title");
+            initEditor("Instructions");
+        }     
+        
+        function doSelectTab(tabId) {
+        	// start optional tab controller stuff
+        	var tag = document.getElementById("currentTab");
+	    	tag.value = tabId;
+	    	// end optional tab controller stuff
+	    	selectTab(tabId);
+        } 
+        
+        function doSubmit(method) {
+        	document.getElementById("authoringForm").dispatch.value=method;
+        	document.getElementById("authoringForm").submit();
+        }
+        
+    </script>
+	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+
+
+</head>
+<body onLoad="init()">
+
+	<html:form action="authoring" method="post" focus="title" styleId="authoringForm" enctype="multipart/form-data">
+		<html:hidden property="mode" value="teacher" />
+		<html:hidden property="toolContentID" />
+		<html:hidden property="currentTab" styleId="currentTab" />
+		<html:hidden property="dispatch" value="updateContent" />
+
+		<h1>
+			<fmt:message key="label.authoring.heading" />
+		</h1>
+
+		<!-- start tabs -->
+		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
+		<!-- end tab buttons -->
+		<div class="tabbody">
+			<table align=center>
+				<tr>
+					<td NOWRAP>
+						<%@ include file="/common/messages.jsp"%>
+					</td>
+				</tr>
+			</table>
+
+			<!-- tab content 1 (Basic) -->
+			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${toolContentID}" definelater="yes" />
+
+		</div>
+		<lams:HTMLEditor />
+
+
+	</html:form>
+</body>
+</html:html>
Index: lams_tool_sbmt/web/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/definelaterforbid.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/authoring/definelaterforbid.jsp	13 Jun 2006 07:27:25 -0000	1.1
@@ -0,0 +1,4 @@
+<%@ include file="/common/taglibs.jsp"%>
+<div align="center">
+	<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
+</div>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/learner/contentinuse.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/definelater.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/learner/definelater.jsp	13 Jun 2006 07:27:25 -0000	1.1
@@ -0,0 +1,13 @@
+<%@include file="/common/taglibs.jsp"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+</head>
+
+<body>
+	<div align="center">
+		<fmt:message key="define.later.message" />
+	</div>
+
+</body>
+</html:html>
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/runoffline.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/learner/runoffline.jsp	13 Jun 2006 07:27:25 -0000	1.1
@@ -0,0 +1,28 @@
+<%@include file="/common/taglibs.jsp"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+	<%@include file="/common/header.jsp"%>
+	<script language="javascript">
+		var locked =  <c:out value="${learner.locked}"/>;
+		function finish(){
+			var finishUrl= "<html:rewrite page='/learner.do?method=finish&toolSessionID=${learner.toolSessionID}'/>";
+			location.href= finishUrl;
+		}
+	</script>
+</head>
+
+<body>
+	<div align="center">
+		<h2>
+			<fmt:message key="run.offline.message" />
+		</h2>
+ 	<p>
+		<html:button property="finished" onclick="finish()" disabled="${learner.locked}" styleClass="buttonStyle">
+			<fmt:message key="label.learner.finished" />
+		</html:button>
+
+	</div>
+
+</body>
+</html:html>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_sbmt/web/monitoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_tool_sbmt/web/monitoring/editactivity.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/monitoring/showactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/showactivity.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/web/monitoring/showactivity.jsp	19 May 2006 05:24:41 -0000	1.6
+++ lams_tool_sbmt/web/monitoring/showactivity.jsp	13 Jun 2006 07:27:25 -0000	1.7
@@ -20,9 +20,23 @@
 				</td>
 			</tr>
 			<tr><td colspan="2">
-				<html:link href="javascript:doSubmit('editActivity');" property="editActivity" styleClass="button">
-						<bean:message key="label.monitoring.edit.activity.edit" />
-				</html:link>
+				<c:set var="isPageEditable" value="${isPageEditable}" />
+				<c:choose>
+					<c:when test='${isPageEditable == "true"}'>
+						<c:url value="/authoring.do" var="authoringUrl">
+							<c:param name="mode" value="teacher" />
+							<c:param name="toolContentID" value="${sessionScope.toolContentID}" />
+						</c:url>
+						<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+							<fmt:message key="label.monitoring.edit.activity.edit" />
+						</html:link>
+					</c:when>
+					<c:otherwise>
+						<div align="center"><B>
+							<fmt:message key="message.monitoring.edit.activity.not.editable" />
+						</B></div>
+					</c:otherwise>
+				</c:choose>
 			</td></tr>
 		</table>
 	</div>
\ No newline at end of file