Index: lams_tool_sbmt/conf/xdoclet/struts-actions.xml
===================================================================
diff -u
--- lams_tool_sbmt/conf/xdoclet/struts-actions.xml	(revision 0)
+++ lams_tool_sbmt/conf/xdoclet/struts-actions.xml	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -0,0 +1,19 @@
+		<!-- ========== Action Mapping Definitions ============================== -->
+		<action path="/definelater"
+			type="org.lamsfoundation.lams.tool.sbmt.web.MonitoringAction"
+			name="emptyForm" 
+			scope="request" 
+			parameter="method" 
+			validate="false">
+			      <forward
+			        name="definelater"
+			        path="/monitoring/definelater.jsp"
+			        redirect="false"
+			      />
+			      <forward
+			        name="definelatersuccess"
+			        path="/monitoring/definelater.jsp"
+			        redirect="false"
+			      />
+		</action>
+
Index: lams_tool_sbmt/db/sql/tool_insert.sql
===================================================================
diff -u -r962c5c1d7944295ea119ff346b96f2bcd8f49d9d -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 962c5c1d7944295ea119ff346b96f2bcd8f49d9d)
+++ lams_tool_sbmt/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -20,9 +20,9 @@
 supports_contribute_flag,
 learner_url,
 author_url,
-define_later_url,
-export_portfolio_url,
 monitor_url,
+export_portfolio_url,
+define_later_url,
 contribute_url,
 moderation_url,
 create_date_time
@@ -45,9 +45,9 @@
 0,
 'tool/lasbmt11/learner.do',
 'tool/lasbmt11/authoring.do',
-'tool/lasbmt11/definelater.do',
-'tool/lasbmt11/exportPortfolio',
 'tool/lasbmt11/monitoring.do',
+'tool/lasbmt11/exportPortfolio',
+'tool/lasbmt11/definelater.do?method=editActivity&mode=definelater',
 'tool/lasbmt11/contribute.do',
 'tool/lasbmt11/moderation.do',
 NOW()
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
diff -u -r5898edda68b929c633d1dc6092ab4caa313016ac -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision 5898edda68b929c633d1dc6092ab4caa313016ac)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -98,3 +98,4 @@
 errors.general=The process did not complete. Details should follow.
 errors.token=Request could not be completed. Operation is not in sequence.
 errors.maxfilesize=The uploaded file has exceeded the maximum file size limit of {0} bytes
+error.read.only.mode=Read only mode, function can not be finished
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r75505d34c45a3c8b688d43860e1dd8d0a25d6bc4 -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 75505d34c45a3c8b688d43860e1dd8d0a25d6bc4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -63,7 +63,7 @@
  *                scope="request" 
  *                validate="true"
  * 
- * @struts.action-forward name="success" path="/authoring/success.jsp"
+ * @struts.action-forward name="success" path="/authoring/authoring.jsp"
  * @struts.action-exception 
  * 				type="org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException" 
  * 				key="authoring.exception"
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -rf2f9719ac9da5fcffc7f73597545697deb22af88 -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision f2f9719ac9da5fcffc7f73597545697deb22af88)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -53,7 +53,6 @@
  * 			validate="false"
  * 
  * @struts.action-forward name="upload" path="/learner/sbmtLearner.jsp"
- * @struts.action-forward name="finish" path="/learner/finish.jsp"
  * @struts.action-forward name="contentInUse" path="/learner/contentinuse.jsp"
  * 
  */
@@ -226,8 +225,10 @@
 			}
 			return null;
 		}
-		 request.getSession().setAttribute(SbmtConstants.READ_ONLY_MODE, "true");
-		return mapping.findForward("finish");
+		
+		request.getSession().setAttribute(SbmtConstants.READ_ONLY_MODE, "true");
+		return returnErrors(mapping,request,"error.read.only.mode","upload");
+		
 	}
 	/**
 	 * This is a utily function for forwarding the errors to the respective JSP
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -rf68943b05d59da72d7f82a3d4cdeefc980909f4b -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision f68943b05d59da72d7f82a3d4cdeefc980909f4b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -71,13 +72,13 @@
  * @struts.action-forward name="allUserMarks" path="/monitoring/viewallmarks.jsp"
  * 
  * @struts.action-forward name="instructions" path="/monitoring/instructions.jsp"
- * 
  * @struts.action-forward name="showActivity" path="/monitoring/showactivity.jsp"
  * @struts.action-forward name="editActivity" path="/monitoring/editactivity.jsp"
- * @struts.action-forward name="success" path="/monitoring/success.jsp"
+ * @struts.action-forward name="success" path="/monitoring/showactivity.jsp"
  * 
  * @struts.action-forward name="statistic" path="/monitoring/statistic.jsp"
  * 
+ * 
  */
 public class MonitoringAction extends DispatchAction {
 	
@@ -115,7 +116,7 @@
 			   HttpServletRequest request,
 			   HttpServletResponse response){
 		//Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));		
-        Long contentID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+        Long contentID = (Long) request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID);
 		submitFilesService = getSubmitFilesService();
 		//List userList = submitFilesService.getUsers(sessionID);
         List submitFilesSessionList = submitFilesService.getSubmitFilesSessionByContentID(contentID);
@@ -250,8 +251,9 @@
 		submitFilesService = getSubmitFilesService();
 		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
 		submitFilesService.releaseMarksForSession(sessionID);
-		//todo: need display some success info
-		return mapping.findForward("userMarks");
+		
+		//echo message back
+		return userList(mapping, form, request, response);
 	}
 	public ActionForward downloadMarks(ActionMapping mapping,
 			   ActionForm form,
@@ -388,7 +390,8 @@
 			   HttpServletRequest request,
 			   HttpServletResponse response){
 
-		getAuthoringActivity(form, request);
+		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		getAuthoringActivity(contentID, request);
 		return mapping.findForward("showActivity");
 	}
 	/**
@@ -403,9 +406,13 @@
 			   ActionForm form,
 			   HttpServletRequest request,
 			   HttpServletResponse response){
-		
-		getAuthoringActivity(form, request);
-		return mapping.findForward("editActivity");
+		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		getAuthoringActivity(contentID, request);
+		String mode = request.getParameter("mode");
+		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.
@@ -431,7 +438,13 @@
 		content.setInstruction(instructions);
 		submitFilesService.saveOrUpdateContent(content);
 		
-		return mapping.findForward("success");
+		getAuthoringActivity(contentID, request);
+		
+		String mode = request.getParameter("mode");
+		if(StringUtils.equals(mode,"definelater"))
+			return mapping.findForward("definelatersuccess");
+		else
+			return mapping.findForward("success");
 	}
 	/**
 	 * Provide statistic information. Includes:<br>
@@ -487,11 +500,11 @@
 		return mapping.findForward("statistic");
 	}
 	/**
+	 * @param request 
 	 * @param form
 	 * @param request
 	 */
-	private void getAuthoringActivity(ActionForm form, HttpServletRequest request) {
-		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+	private void getAuthoringActivity(Long contentID, ServletRequest request) {
 		
 		//get back the upload file list and display them on page
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rc6b6b6b37a75598d144929e5757c4270d704141f -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c6b6b6b37a75598d144929e5757c4270d704141f)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -82,11 +82,6 @@
         redirect="false"
       />
       <forward
-        name="finish"
-        path="/learner/finish.jsp"
-        redirect="false"
-      />
-      <forward
         name="contentInUse"
         path="/learner/contentinuse.jsp"
         redirect="false"
@@ -138,7 +133,7 @@
       />
       <forward
         name="success"
-        path="/monitoring/success.jsp"
+        path="/monitoring/showactivity.jsp"
         redirect="false"
       />
       <forward
@@ -172,12 +167,30 @@
       />
       <forward
         name="success"
-        path="/authoring/success.jsp"
+        path="/authoring/authoring.jsp"
         redirect="false"
       />
     </action>
 
-    <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
+   		<!-- ========== Action Mapping Definitions ============================== -->
+		<action path="/definelater"
+			type="org.lamsfoundation.lams.tool.sbmt.web.MonitoringAction"
+			name="emptyForm" 
+			scope="request" 
+			parameter="method" 
+			validate="false">
+			      <forward
+			        name="definelater"
+			        path="/monitoring/definelater.jsp"
+			        redirect="false"
+			      />
+			      <forward
+			        name="definelatersuccess"
+			        path="/monitoring/definelater.jsp"
+			        redirect="false"
+			      />
+		</action>
+
   </action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/authoring/advance.jsp	(revision 0)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -0,0 +1,26 @@
+<!---------------------------Advance Tab Content ------------------------>	
+	<div id='content_a'  class="tabbody content_a">
+	<h1><fmt:message key="label.authoring.heading.advance" /></h1>
+	<h2><fmt:message key="label.authoring.heading.advance.desc" /></h2>
+	<table class="forms">
+		<!-- Instructions Row -->
+		<tr>
+			<td colspan="2 class="formcontrol">
+				<html:checkbox property="lockOnFinished" value="1">
+					<fmt:message key="label.authoring.advance.lock.on.finished" />
+				</html:checkbox>
+			</td>
+		</tr>
+		<!-- Button Row -->
+		<tr><td colspan="2"><html:errors/></td></tr>
+		<tr>
+			<td><html:button property="cancel" onclick="window.close()" styleClass="button">
+				<fmt:message key="label.authoring.cancel.button" />
+			</html:button></td>
+			<td >
+			<html:submit property="action" styleClass="button">
+				<fmt:message key="label.authoring.save.button" />
+			</html:submit></td>
+		</tr>
+	</table>
+	</div>
\ No newline at end of file
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -r7c58f83ab0f0232b3f84cce25c6c30ef06f0b36f -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7c58f83ab0f0232b3f84cce25c6c30ef06f0b36f)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -68,186 +68,10 @@
   </tr>
 </table>
     <!-- end tab buttons -->
-
+	<%@ include file="basic.jsp"%>
+	<%@ include file="advance.jsp"%>
+	<%@ include file="instructions.jsp"%>
 	
-	<!---------------------------Basic Tab Content ------------------------>
-	<div id='content_b' class="tabbody content_b" >
-	<h1><fmt:message key="label.authoring.heading.basic" /></h1>
-	<h2><fmt:message key="label.authoring.heading.basic.desc" /></h2>
-	<table class="forms">
-		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
-			<td class="formcontrol"><html:text property="title" /></td>
-		</tr>
-		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="instructions"
-				basePath="/lams/fckeditor/" height="150" width="85%">
-				<c:out value="${authoring.instruction}" escapeXml="false"/>
-			</FCK:editor></td>
-		</tr>
-		<!-- Button Row -->
-		<tr><td colspan="2"><html:errors/></td></tr>
-		<tr>
-			<td colspan="2" class="formcontrol"><html:button property="cancel"
-				onclick="window.close()">
-				<fmt:message key="label.authoring.cancel.button" />
-				</html:button>
-				<html:submit property="action">
-					<fmt:message key="label.authoring.save.button" />
-				</html:submit>
-			</td>
-		</tr>
-	</table>
-
-	</div>
-	
-	<!---------------------------Instruction Tab Content ------------------------>
-	<div id='content_i'  class="tabbody content_i">
-	<h1><fmt:message key="label.authoring.heading.instructions" /></h1>
-	<h2><fmt:message key="label.authoring.heading.instructions.desc" /></h2>
-	<table class="forms">
-		<!--hidden field contentID passed by flash-->
-		<tr>
-		</tr>
-		<!-- Instructions Row -->
-		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.online.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="onlineInstruction"
-				basePath="/lams/fckeditor/" height="150" width="85%">
-				<c:out value="${authoring.onlineInstruction}" escapeXml="false"/>
-			</FCK:editor></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td class="formcontrol">
-				<div id="onlinefile">
-				<c:forEach var="file" items="${authoring.onlineFiles}">
-					<li><c:out value="${file.name}"/>
-					<c:set var="viewURL">
-						<html:rewrite page="/download/?uuid=${file.uuID}&preferDownload=false"/>
-					</c:set>
-					<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-						<fmt:message key="label.view"/>
-					</a>&nbsp;
-					<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${details.versionID}&preferDownload=true"/>
-					</c:set>
-					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-						<fmt:message key="label.download"/>
-					</a>&nbsp;
-					<c:set var="deleteonline">
-					<html:rewrite page="/deletefile.do?method=deleteOnlineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}"/>
-					</c:set>
-					<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
-						<fmt:message key="label.authoring.online.delete"/>
-					</html:link>					
-					</li>
-				</c:forEach>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="formlabel">
-				<fmt:message key="label.authoring.online.file" />:
-			</td>
-			<td class="formcontrol">
-				<html:file property="onlineFile">
-					<fmt:message key="label.authoring.choosefile.button" />
-				</html:file>
-				<html:submit property="action">
-					<fmt:message key="label.authoring.upload.online.button" />
-				</html:submit>
-			</td>
-		</tr>	
-		<!------------Offline Instructions ----------------------->
-		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.offline.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="offlineInstruction"
-				basePath="/lams/fckeditor/" height="150" width="85%">
-				<c:out value="${authoring.offlineInstruction}" escapeXml="false"/>
-			</FCK:editor></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td class="formcontrol">
-				<div id="offlinefile">
-				<c:forEach var="file" items="${authoring.offlineFiles}">
-					<li><c:out value="${file.name}"/>
-					<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
-						<fmt:message key="label.view"/>
-					</html:link>
-					<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
-						<fmt:message key="label.download"/>
-					</html:link>
-					<c:set var="deleteoffline">
-					<html:rewrite page="/deletefile.do?method=deleteOfflineFile&toolContentID=${authoring.contentID}&uuID=${file.uuID}&versionID=${file.versionID}"/>
-					</c:set>
-					<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
-						<fmt:message key="label.authoring.offline.delete"/>
-					</html:link>					
-					</li>
-				</c:forEach>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="formlabel">
-				<fmt:message key="label.authoring.offline.file" />:
-			</td>
-			<td class="formcontrol">
-				<html:file property="offlineFile">
-					<fmt:message key="label.authoring.choosefile.button" />
-				</html:file>
-				<html:submit property="action">
-					<fmt:message key="label.authoring.upload.offline.button" />
-				</html:submit>
-			</td>
-		</tr>			
-		</tr>
-		<!-- Button Row -->
-		<tr><td colspan="2"><html:errors/></td></tr>
-		<tr>
-			<td class="formcontrol"><html:button property="cancel"
-				onclick="window.close()">
-				<fmt:message key="label.authoring.cancel.button" />
-			</html:button></td>
-			<td class="formcontrol">
-			<html:submit property="action">
-				<fmt:message key="label.authoring.save.button" />
-			</html:submit></td>
-		</tr>
-	</table>
-	</div>
-	<!---------------------------Advance Tab Content ------------------------>	
-	<div id='content_a'  class="tabbody content_a">
-	<h1><fmt:message key="label.authoring.heading.advance" /></h1>
-	<h2><fmt:message key="label.authoring.heading.advance.desc" /></h2>
-	<table class="forms">
-		<!-- Instructions Row -->
-		<tr>
-			<td colspan="2 class="formcontrol">
-				<html:checkbox property="lockOnFinished" value="1">
-					<fmt:message key="label.authoring.advance.lock.on.finished" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<!-- Button Row -->
-		<tr><td colspan="2"><html:errors/></td></tr>
-		<tr>
-			<td><html:button property="cancel" onclick="window.close()" styleClass="button">
-				<fmt:message key="label.authoring.cancel.button" />
-			</html:button></td>
-			<td >
-			<html:submit property="action" styleClass="button">
-				<fmt:message key="label.authoring.save.button" />
-			</html:submit></td>
-		</tr>
-	</table>
-	</div>
-	
 </html:form>
 </body>
 </html:html>
Index: lams_tool_sbmt/web/authoring/basic.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/authoring/basic.jsp	(revision 0)
+++ lams_tool_sbmt/web/authoring/basic.jsp	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -0,0 +1,32 @@
+	<!---------------------------Basic Tab Content ------------------------>
+	<div id='content_b' class="tabbody content_b" >
+	<h1><fmt:message key="label.authoring.heading.basic" /></h1>
+	<h2><fmt:message key="label.authoring.heading.basic.desc" /></h2>
+	<table class="forms">
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
+			<td class="formcontrol"><html:text property="title" /></td>
+		</tr>
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
+			<td class="formcontrol"><FCK:editor id="instructions"
+				basePath="/lams/fckeditor/" height="150" width="85%">
+				<c:out value="${authoring.instruction}" escapeXml="false"/>
+			</FCK:editor></td>
+		</tr>
+		<!-- Button Row -->
+		<tr><td colspan="2"><html:errors/></td></tr>
+		<tr>
+			<td colspan="2" class="formcontrol"><html:button property="cancel"
+				onclick="window.close()">
+				<fmt:message key="label.authoring.cancel.button" />
+				</html:button>
+				<html:submit property="action">
+					<fmt:message key="label.authoring.save.button" />
+				</html:submit>
+			</td>
+		</tr>
+	</table>
+
+	</div>
+	
\ No newline at end of file
Fisheye: Tag 917358423e83fc323518885887537421fd0afafb refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag caa2067252ae8e286a8872b400208db6b5fed4eb refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/success.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag caa2067252ae8e286a8872b400208db6b5fed4eb refers to a dead (removed) revision in file `lams_tool_sbmt/web/learner/finish.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/monitoring/basic.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/monitoring/basic.jsp	(revision 0)
+++ lams_tool_sbmt/web/monitoring/basic.jsp	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -0,0 +1,26 @@
+		<div id="basic">
+		<h1><fmt:message key="label.authoring.heading.basic" /></h1>
+		<h1><fmt:message key="label.authoring.heading.basic.desc" /></h1>
+		<table class="forms">
+			<!--hidden field contentID passed by flash-->
+			<input type="hidden" name="toolContentID" value="<c:out value='${authoring.contentID}'/>"/>
+			<input type="hidden" name="method" value="updateActivity"/>
+			<!-- Title Row -->
+			<tr>
+				<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
+				<td class="formcontrol">
+					<input type="text" name="title" value="<c:out value='${authoring.title}' escapeXml='false'/>" />
+				</td>
+			</tr>
+			<!-- Instructions Row -->
+			<tr>
+				<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
+				<td class="formcontrol">
+					<FCK:editor id="instructions"
+						basePath="/lams/fckeditor/" height="150" width="85%">
+						<c:out value="${authoring.instruction}" escapeXml="false"/>
+					</FCK:editor>
+				</td>
+			</tr>
+		</table>
+		</div>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/definelater.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/monitoring/definelater.jsp	(revision 0)
+++ lams_tool_sbmt/web/monitoring/definelater.jsp	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -0,0 +1,36 @@
+<%@include file="../sharing/share.jsp" %>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+  <head>    
+    <title>Monitoring define it later</title>
+    <html:base/>
+  	<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
+  </head>  
+  <body>
+  
+  <html:form action="monitoring" method="post">
+  <html:errors/>
+	  	<html:hidden property="mode" value="definelater"/>
+		 <%@ include file="basic.jsp"%>
+		 <table>
+		 		<tr>
+		 		<td>
+				<html:button property="close" onclick="javascript:window.close()">
+					<fmt:message key="label.monitoring.edit.activity.cancel"/>
+				</html:button>
+				</td>
+				<td>
+				<html:submit onclick="javascript:window.close()">
+					<fmt:message key="label.monitoring.edit.activity.update"/>
+				</html:submit>
+			</td>
+			</tr>
+		</table>
+		 
+  </html:form>
+  
+   </body>
+</html:html>
+  
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/editactivity.jsp
===================================================================
diff -u -rf68943b05d59da72d7f82a3d4cdeefc980909f4b -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/web/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision f68943b05d59da72d7f82a3d4cdeefc980909f4b)
+++ lams_tool_sbmt/web/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -19,40 +19,22 @@
     </div>
 	<html:form action="monitoring" method="post" >
 		<html:errors/>
-		<div id="basic">
-		<h1><fmt:message key="label.authoring.heading.basic" /></h1>
-		<h1><fmt:message key="label.authoring.heading.basic.desc" /></h1>
-		<table class="forms">
-			<!--hidden field contentID passed by flash-->
-			<input type="hidden" name="toolContentID" value="<c:out value='${authoring.contentID}'/>"/>
-			<input type="hidden" name="method" value="updateActivity"/>
-			<!-- Title Row -->
-			<tr>
-				<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
-				<td class="formcontrol">
-					<input type="text" name="title" value="<c:out value='${authoring.title}' escapeXml='false'/>" />
-				</td>
-			</tr>
-			<!-- Instructions Row -->
-			<tr>
-				<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
-				<td class="formcontrol">
-					<FCK:editor id="instructions"
-						basePath="/lams/fckeditor/" height="150" width="85%">
-						<c:out value="${authoring.instruction}" escapeXml="false"/>
-					</FCK:editor>
-				</td>
-			</tr>
-			<tr><td colspan="2">
-				<html:cancel>
+  	    <%@ include file="basic.jsp"%>
+  	   	<table>
+		 		<tr>
+		 		<td>
+				<html:button property="cancel" onclick="javascript:history.back()">
 					<fmt:message key="label.monitoring.edit.activity.cancel"/>
-				</html:cancel>
+				</html:button>
+				</td>
+				<td>
 				<html:submit>
 					<fmt:message key="label.monitoring.edit.activity.update"/>
 				</html:submit>
-			</td></tr>
+			</td>
+			</tr>
 		</table>
-		</div>
+  	    
 	</html:form>
 </body>
 </html:html>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/showactivity.jsp
===================================================================
diff -u -rf68943b05d59da72d7f82a3d4cdeefc980909f4b -rcaa2067252ae8e286a8872b400208db6b5fed4eb
--- lams_tool_sbmt/web/monitoring/showactivity.jsp	(.../showactivity.jsp)	(revision f68943b05d59da72d7f82a3d4cdeefc980909f4b)
+++ lams_tool_sbmt/web/monitoring/showactivity.jsp	(.../showactivity.jsp)	(revision caa2067252ae8e286a8872b400208db6b5fed4eb)
@@ -20,7 +20,7 @@
 		<h1><fmt:message key="label.authoring.heading.basic.desc" /></h1>
 		<table class="forms">
 			<!--hidden field contentID passed by flash-->
-			<input type="hidden" name="toolContentID" value="<c:out value='${authoring.contentID}'/>"/>
+			<input type="hidden" name="toolContentID" value="<c:out value='${sessionScope.toolContentID}'/>"/>
 			<input type="hidden" name="method" value="editActivity"/>
 			<!-- Title Row -->
 			<tr>
Fisheye: Tag caa2067252ae8e286a8872b400208db6b5fed4eb refers to a dead (removed) revision in file `lams_tool_sbmt/web/monitoring/success.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?