Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java,v
diff -u -r1.9.2.2 -r1.9.2.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java	11 May 2016 07:14:28 -0000	1.9.2.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java	24 Mar 2017 16:36:40 -0000	1.9.2.3
@@ -75,7 +75,6 @@
 
 /**
  * @author Marcin Cieslak
- * @version $Revision$
  */
 public class AuthoringAction extends Action {
 
@@ -153,7 +152,7 @@
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	int questionIndex = NumberUtils.stringToInt(request.getParameter(DacoConstants.PARAM_QUESTION_INDEX), -1);
 	DacoQuestion question = null;
 	DacoQuestionForm questionForm = (DacoQuestionForm) form;
@@ -185,7 +184,7 @@
 	 * question.
 	 */
 
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(questionForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(questionForm.getSessionMapID());
 	// check whether it is "edit(old question)" or "add(new question)"
 	SortedSet<DacoQuestion> questionSet = getQuestionList(sessionMap);
 	int questionIndex = NumberUtils.stringToInt(questionForm.getQuestionIndex(), -1);
@@ -362,7 +361,7 @@
      * @param request
      * @return
      */
-    protected List getDeletedDacoQuestionList(SessionMap sessionMap) {
+    protected List getDeletedDacoQuestionList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, DacoConstants.ATTR_DELETED_QUESTION_LIST);
     }
 
@@ -373,7 +372,7 @@
      * @param name
      * @return
      */
-    protected List getListFromSession(SessionMap sessionMap, String name) {
+    protected List getListFromSession(SessionMap<String, Object> sessionMap, String name) {
 	List list = (List) sessionMap.get(name);
 	if (list == null) {
 	    list = new ArrayList();
@@ -406,7 +405,7 @@
      * @param request
      * @return
      */
-    protected SortedSet<DacoQuestion> getQuestionList(SessionMap sessionMap) {
+    protected SortedSet<DacoQuestion> getQuestionList(SessionMap<String, Object> sessionMap) {
 
 	SortedSet<DacoQuestion> list = (SortedSet<DacoQuestion>) sessionMap.get(DacoConstants.ATTR_QUESTION_LIST);
 	if (list == null) {
@@ -429,7 +428,7 @@
     protected ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	DacoForm existForm = (DacoForm) sessionMap.get(DacoConstants.ATTR_DACO_FORM);
 
 	DacoForm dacoForm = (DacoForm) form;
@@ -440,11 +439,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(DacoConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(DacoConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	
+	return mapping.findForward(DacoConstants.SUCCESS);
     }
 
     /**
@@ -594,7 +591,7 @@
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	int questionIndex = NumberUtils.stringToInt(request.getParameter(DacoConstants.PARAM_QUESTION_INDEX), -1);
 	if (questionIndex != -1) {
@@ -686,7 +683,7 @@
 	DacoForm dacoForm = (DacoForm) form;
 
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	dacoForm.setSessionMapID(sessionMap.getSessionID());
 
@@ -764,18 +761,15 @@
 	DacoForm dacoForm = (DacoForm) form;
 
 	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(dacoForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(dacoForm.getSessionMapID());
 
 	ToolAccessMode toolAccessMode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, toolAccessMode.toString());
 
 	ActionMessages errors = validateDacoForm(dacoForm, mapping, request);
 	if (!errors.isEmpty()) {
 	    saveErrors(request, errors);
-	    if (toolAccessMode.isAuthor()) {
-		return mapping.findForward("author");
-	    } else {
-		return mapping.findForward("monitor");
-	    }
+	    return mapping.findForward(DacoConstants.SUCCESS);
 	}
 
 	Daco daco = dacoForm.getDaco();
@@ -788,19 +782,17 @@
 	    dacoPO = daco;
 	    dacoPO.setCreated(new Timestamp(new Date().getTime()));
 	    dacoPO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
 	    service.releaseDacoFromCache(dacoPO);
-	    if (toolAccessMode.isAuthor()) {
-
-		Long uid = dacoPO.getUid();
-		PropertyUtils.copyProperties(dacoPO, daco);
-		// get back UID
-		dacoPO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content
-			 // (definelater)
-		dacoPO.setInstructions(daco.getInstructions());
-		dacoPO.setTitle(daco.getTitle());
-		// change define later status
+	    
+	    Long uid = dacoPO.getUid();
+	    PropertyUtils.copyProperties(dacoPO, daco);
+	    // get back UID
+	    dacoPO.setUid(uid);
+	    
+	    // if it's a teacher - change define later status
+	    if (toolAccessMode.isTeacher()) {
 		dacoPO.setDefineLater(false);
 	    }
 	    dacoPO.setUpdated(new Timestamp(new Date().getTime()));
@@ -849,12 +841,7 @@
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 
-	if (toolAccessMode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
-
+	return mapping.findForward(DacoConstants.SUCCESS);
     }
 
     protected ActionMessages validateDacoForm(DacoForm dacoForm, ActionMapping mapping, HttpServletRequest request) {
@@ -866,13 +853,6 @@
 		    new ActionMessage(DacoConstants.ERROR_MSG_RECORDLIMIT_MIN_TOOHIGH_MAX));
 	}
 
-	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-	if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
-	    return errors;
-	}
-
-	// Some other validation outside basic Tab.
-
 	return errors;
     }
 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java,v
diff -u -r1.1.12.2 -r1.1.12.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java	11 May 2016 07:14:28 -0000	1.1.12.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java	24 Mar 2017 16:36:40 -0000	1.1.12.3
@@ -33,8 +33,6 @@
  * This class give a chance to clear HttpSession when user save/close authoring page.
  * 
  * @author Steve.Ni
- *
- * @version $Revision$
  */
 public class ClearSessionAction extends LamsAuthoringFinishAction {
 
Index: lams_tool_daco/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_daco/web/WEB-INF/struts-config.xml	28 Feb 2017 17:13:22 -0000	1.1.2.2
+++ lams_tool_daco/web/WEB-INF/struts-config.xml	24 Mar 2017 16:36:40 -0000	1.1.2.3
@@ -52,28 +52,46 @@
 
    <!-- ========== Action Mapping Definitions ============================== -->
 <!-- ========== BEGIN: Authroing Definitions ============================== -->
-<action path="/authoring/start" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction" name="dacoForm"
-	scope="request" parameter="start" validate="false">
+<action path="/authoring/start" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction" 
+	name="dacoForm"
+	scope="request" 
+	parameter="start" 
+	validate="false">
 	<forward name="success" path="/pages/authoring/start.jsp" />
 </action>
-<action path="/definelater" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction" name="dacoForm" scope="request"
-	parameter="definelater" validate="false">
+<action path="/definelater" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction" 
+	name="dacoForm" 
+	scope="request"
+	parameter="definelater" 
+	validate="false">
 	<forward name="success" path="/pages/authoring/start.jsp" />
 </action>
-<action path="/authoring/init" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction" name="dacoForm" scope="request"
-	parameter="initPage" validate="false">
+<action path="/authoring/init" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction" 
+	name="dacoForm" 
+	scope="request"
+	parameter="initPage" 
+	validate="false">
 	<forward name="success" path="/pages/authoring/authoring.jsp" />
-	<forward name="definelater" path="/pages/authoring/definelater.jsp" />
 </action>
 
-<action path="/authoring/update" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction" name="dacoForm"
-	scope="request" parameter="updateContent" validate="false">
-	<forward name="author" path="/pages/authoring/authoring.jsp" />
-	<forward name="monitor" path="/pages/authoring/definelater.jsp" />
+<action path="/authoring/update" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction" 
+	name="dacoForm"
+	scope="request" 
+	parameter="updateContent" 
+	validate="false">
+	<forward name="success" path="/pages/authoring/authoring.jsp" />
 </action>
 <!-- ==========  Daco Question  ========== -->
-<action path="/authoring/newQuestion" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
-	name="dacoQuestionForm" scope="request" validate="false" parameter="newQuestion">
+<action path="/authoring/newQuestion" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
+	name="dacoQuestionForm" 
+	scope="request" 
+	validate="false" 
+	parameter="newQuestion">
 	<forward name="textfield" path="/pages/authoring/parts/addtextfield.jsp" />
 	<forward name="textarea" path="/pages/authoring/parts/addtextarea.jsp" />
 	<forward name="number" path="/pages/authoring/parts/addnumber.jsp" />
@@ -86,8 +104,12 @@
 	<forward name="longlat" path="/pages/authoring/parts/addlonglat.jsp" />
 </action>
 
-<action path="/authoring/editQuestion" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
-	name="dacoQuestionForm" scope="request" parameter="editQuestion" validate="false">
+<action path="/authoring/editQuestion" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
+	name="dacoQuestionForm" 
+	scope="request" 
+	parameter="editQuestion" 
+	validate="false">
 	<forward name="textfield" path="/pages/authoring/parts/addtextfield.jsp" />
 	<forward name="textarea" path="/pages/authoring/parts/addtextarea.jsp" />
 	<forward name="number" path="/pages/authoring/parts/addnumber.jsp" />
@@ -100,8 +122,12 @@
 	<forward name="longlat" path="/pages/authoring/parts/addlonglat.jsp" />
 </action>
 
-<action path="/authoring/saveOrUpdateQuestion" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
-	parameter="saveOrUpdateQuestion" name="dacoQuestionForm" scope="request" validate="false">
+<action path="/authoring/saveOrUpdateQuestion" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
+	parameter="saveOrUpdateQuestion" 
+	name="dacoQuestionForm" 
+	scope="request" 
+	validate="false">
 	<forward name="textfield" path="/pages/authoring/parts/addtextfield.jsp" />
 	<forward name="textarea" path="/pages/authoring/parts/addtextarea.jsp" />
 	<forward name="number" path="/pages/authoring/parts/addnumber.jsp" />
@@ -114,100 +140,152 @@
 	<forward name="longlat" path="/pages/authoring/parts/addlonglat.jsp" />
 	<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
 </action>
-<action path="/authoring/removeQuestion" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
+<action path="/authoring/removeQuestion" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
 	parameter="removeQuestion">
 	<forward name="success" path="/pages/authoring/parts/questionlist.jsp" />
 </action>
 
 <!-- ==========  Answer options  ========== -->
-<action path="/authoring/newAnswerOption" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
+<action path="/authoring/newAnswerOption" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
 	parameter="newAnswerOption">
 	<forward name="success" path="/pages/authoring/parts/answeroptions.jsp" />
 </action>
-<action path="/authoring/removeAnswerOption" type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
+<action path="/authoring/removeAnswerOption" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.AuthoringAction"
 	parameter="removeAnswerOption">
 	<forward name="success" path="/pages/authoring/parts/answeroptions.jsp" />
 </action>
 
 <!-- ========== BEGIN: Learning Definitions ============================== -->
-<action path="/learning/start" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="start"
-	name="recordForm" scope="request" validate="false">
+<action path="/learning/start" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" 
+	parameter="start"
+	name="recordForm" 
+	scope="request" 
+	validate="false">
 	<forward name="success" path="/pages/learning/learning.jsp" />
 	<forward name="definelater" path="/pages/learning/definelater.jsp" />
 </action>
-<action path="/learning/finish" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction"
-	input="/pages/learning/learning.jsp" parameter="finish">
+<action path="/learning/finish" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction"
+	input="/pages/learning/learning.jsp" 
+	parameter="finish">
 	<forward name="success" path="/pages/learning/finish.jsp" />
 </action>
-<action path="/learning/saveOrUpdateRecord" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction"
-	parameter="saveOrUpdateRecord" input="/pages/learning/addRecord.jsp" name="recordForm" scope="request" validate="false">
+<action path="/learning/saveOrUpdateRecord" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction"
+	parameter="saveOrUpdateRecord" 
+	input="/pages/learning/addRecord.jsp" 
+	name="recordForm" 
+	scope="request" 
+	validate="false">
 	<forward name="success" path="/pages/learning/learning.jsp" />
 </action>
 
-<action path="/learning/editRecord" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="editRecord"
-	name="recordForm" scope="request" validate="false">
+<action path="/learning/editRecord" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="editRecord"
+	name="recordForm" 
+	scope="request" 
+	validate="false">
 	<forward name="success" path="/pages/learning/addRecord.jsp" />
 </action>
 
-<action path="/learning/diplayHorizontalRecordList" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="diplayHorizontalRecordList">
+<action path="/learning/diplayHorizontalRecordList" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" 
+	parameter="diplayHorizontalRecordList">
 	<forward name="success" path="/pages/learning/listRecordsHorizontalPart.jsp" />
 </action>
 
-<action path="/learning/removeRecord" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="removeRecord">
+<action path="/learning/removeRecord" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" 
+	parameter="removeRecord">
 	<forward name="success" path="/pages/learning/listRecords.jsp" />
 </action>
 
-<action path="/learning/changeView" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="changeView">
+<action path="/learning/changeView" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" 
+	parameter="changeView">
 	<forward name="success" path="/pages/learning/learning.jsp" />
 </action>
 
-<action path="/learning/refreshQuestionSummaries" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" parameter="refreshQuestionSummaries">
+<action path="/learning/refreshQuestionSummaries" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" 
+	parameter="refreshQuestionSummaries">
 	<forward name="success" path="/pages/learning/questionSummaries.jsp" />
 </action>
 
 <!--  ========= Reflection =============== -->
-<action path="/learning/startReflection" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" name="reflectionForm"
-	validate="false" parameter="startReflection" input="/pages/learning/learning.jsp" scope="request">
+<action path="/learning/startReflection" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" 
+	name="reflectionForm"
+	validate="false" 
+	parameter="startReflection" 
+	input="/pages/learning/learning.jsp" 
+	scope="request">
 	<forward name="success" path="/pages/learning/notebook.jsp" />
 </action>
 
-<action path="/learning/submitReflection" type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" name="reflectionForm"
-	validate="false" input="/pages/learning/notebook.jsp" parameter="submitReflection" scope="request">
+<action path="/learning/submitReflection" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.LearningAction" 
+	name="reflectionForm"
+	validate="false" 
+	input="/pages/learning/notebook.jsp" 
+	parameter="submitReflection" 
+	scope="request">
 	<forward name="success" path="/pages/learning/finish.jsp" />
 
 </action>
 <!-- ========== BEGIN: Monitoring Definitions ============================== -->
-<action path="/monitoring/summary" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="summary">
+<action path="/monitoring/summary" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" 
+	parameter="summary">
 	<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 </action>
-<action path="/monitoring/listRecords" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="listRecords">
+<action path="/monitoring/listRecords" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" 
+	parameter="listRecords">
 	<forward name="success" path="/pages/monitoring/listRecords.jsp" />
 </action>
 
-<action path="/monitoring/viewReflection" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction"
+<action path="/monitoring/viewReflection" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction"
 	parameter="viewReflection">
 	<forward name="success" path="/pages/monitoring/notebook.jsp" />
 </action>
-<action path="/monitoring/changeView" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="changeView">
+<action path="/monitoring/changeView" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" 
+	parameter="changeView">
 	<forward name="success" path="/pages/monitoring/listRecords.jsp" />
 </action>
-<action path="/monitoring/getQuestionSummaries" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="getQuestionSummaries">
+<action path="/monitoring/getQuestionSummaries" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" 
+	parameter="getQuestionSummaries">
 	<forward name="success" path="/pages/monitoring/questionSummaries.jsp" />
 </action>
-<action path="/monitoring/statistic" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="statistic">
+<action path="/monitoring/statistic" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" 
+	parameter="statistic">
 	<forward name="success" path="/pages/monitoring/statistics.jsp" />
 </action>
 <action path="/monitoring/getUsers" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="getUsers" >
 </action>
 
 <!--  ========= Export to spreadsheet =============== -->
-<action path="/monitoring/exportToSpreadsheet" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction"
-	validate="false" input="/pages/export/exportToSpreadsheet.jsp" parameter="exportToSpreadsheet" scope="request">
+<action path="/monitoring/exportToSpreadsheet" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction"
+	validate="false" 
+	input="/pages/export/exportToSpreadsheet.jsp" 
+	parameter="exportToSpreadsheet" 
+	scope="request">
 </action>
 <!-- ========== BEGIN: Common ============================== -->
-<action path="/clearsession" type="org.lamsfoundation.lams.tool.daco.web.action.ClearSessionAction"></action>
+<action path="/clearsession" 
+	type="org.lamsfoundation.lams.tool.daco.web.action.ClearSessionAction">
+</action>
 
-  </action-mappings>
+</action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
Index: lams_tool_daco/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/authoring.jsp,v
diff -u -r1.7.2.7 -r1.7.2.8
--- lams_tool_daco/web/pages/authoring/authoring.jsp	26 Apr 2016 12:03:13 -0000	1.7.2.7
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	24 Mar 2017 16:36:40 -0000	1.7.2.8
@@ -1,10 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.daco.DacoConstants"%>
 
-
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.common.heading" /></title>
@@ -18,7 +16,6 @@
 	    		selectTab(tag.value);
             else
                 selectTab(1); //select the default tab;
-          
         }     
         
         function doSelectTab(tabId) {
@@ -27,62 +24,55 @@
 	    	tag.value = tabId;
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);
-	    	    	
         }
-        
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-
  
 </lams:head>
 <body class="stripes" onLoad="init()">
-
 <html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 <c:set var="formBean"  value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
-<c:set var="title"><fmt:message key="label.common.heading" /></c:set>
-<lams:Page title="${title}" type="navbar">
-
- 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+	<c:set var="title"><fmt:message key="label.common.heading" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+	
+	 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 			<lams:Tab id="1" key="label.authoring.heading.basic" />
 			<lams:Tab id="2" key="label.authoring.heading.advanced" />
-	</lams:Tabs>	
+		</lams:Tabs>	
+	
+	 	<lams:TabBodyArea>
+			<%@ include file="/common/messages.jsp"%>
+			<html:hidden property="mode" value="${mode}"/>
+			<html:hidden property="daco.contentId" />
+			<html:hidden property="sessionMapID" />
+			<html:hidden property="contentFolderID" />
+			<html:hidden property="currentTab" styleId="currentTab" />
+	
+	 		<lams:TabBodys>
+				<!-- tab content 1 (Basic) -->
+				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.description" page="basic.jsp" />
+				<!-- end of content (Basic) -->
+	
+				<!-- tab content 2 (Advanced) -->
+				<lams:TabBody id="2" titleKey="label.authoring.heading.advanced.description" page="advanced.jsp" />
+				<!-- end of content (Advanced) -->
+			</lams:TabBodys>
+	
+			<!-- Button Row -->
+			<div id="saveCancelButtons">
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
+				toolSignature="<%=DacoConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.daco.contentId}" 
+				 customiseSessionID="${formBean.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
+				 contentFolderID="${formBean.contentFolderID}"
+				 cancelConfirmMsgKey="message.authoring.cancel.save" />
+			</div>
+		</lams:TabBodyArea>
+	 
+	
+	<div id="footer"></div>
+	<!-- end page div -->
+	</lams:Page>
 
- 	<lams:TabBodyArea>
-		<%@ include file="/common/messages.jsp"%>
-
-
-		<html:hidden property="daco.contentId" />
-		<html:hidden property="sessionMapID" />
-		<html:hidden property="contentFolderID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-
-		
- 		<lams:TabBodys>
-			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.description" page="basic.jsp" />
-			<!-- end of content (Basic) -->
-
-			<!-- tab content 2 (Advanced) -->
-			<lams:TabBody id="2" titleKey="label.authoring.heading.advanced.description" page="advanced.jsp" />
-			<!-- end of content (Advanced) -->
-		</lams:TabBodys>
-
-		<!-- Button Row -->
-		<div id="saveCancelButtons">
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
-			toolSignature="<%=DacoConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.daco.contentId}" 
-			 customiseSessionID="${formBean.sessionMapID}"
-			 contentFolderID="${formBean.contentFolderID}"
-			 cancelConfirmMsgKey="message.authoring.cancel.save" />
-		</div>
-	</lams:TabBodyArea>
- 
-
-<div id="footer"></div>
-<!-- end page div -->
-</lams:Page>
-
 </html:form>
 
 </body>
Fisheye: Tag 1.5.2.3 refers to a dead (removed) revision in file `lams_tool_daco/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java,v
diff -u -r1.9.2.10 -r1.9.2.11
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	9 Mar 2017 19:54:59 -0000	1.9.2.10
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	24 Mar 2017 16:37:10 -0000	1.9.2.11
@@ -256,11 +256,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(ImageGalleryConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(ImageGalleryConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+
+	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
 
     /**
@@ -281,17 +279,8 @@
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(imageGalleryForm.getSessionMapID());
 
 	ToolAccessMode mode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
-	ActionMessages errors = validateImageGallery(imageGalleryForm, request);
-	if (!errors.isEmpty()) {
-	    saveErrors(request, errors);
-	    if (mode.isAuthor()) {
-		return mapping.findForward("author");
-	    } else {
-		return mapping.findForward("monitor");
-	    }
-	}
-
 	ImageGallery imageGallery = imageGalleryForm.getImageGallery();
 	IImageGalleryService service = getImageGalleryService();
 	Long contentId = imageGalleryForm.getImageGallery().getContentId();
@@ -303,16 +292,16 @@
 	    imageGalleryPO = imageGallery;
 	    imageGalleryPO.setCreated(new Timestamp(new Date().getTime()));
 	    imageGalleryPO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = imageGalleryPO.getUid();
-		PropertyUtils.copyProperties(imageGalleryPO, imageGallery);
-		// get back UID
-		imageGalleryPO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content (definelater)
-		imageGalleryPO.setInstructions(imageGallery.getInstructions());
-		imageGalleryPO.setTitle(imageGallery.getTitle());
-		// change define later status
+
+	    Long uid = imageGalleryPO.getUid();
+	    PropertyUtils.copyProperties(imageGalleryPO, imageGallery);
+	    // get back UID
+	    imageGalleryPO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
 		imageGalleryPO.setDefineLater(false);
 	    }
 	    imageGalleryPO.setUpdated(new Timestamp(new Date().getTime()));
@@ -387,11 +376,8 @@
 	imageGalleryForm.setImageGallery(imageGalleryPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	
+	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
 
     // **********************************************************
@@ -872,24 +858,6 @@
     }
 
     /**
-     * Validate imageGallery.
-     *
-     * @param imageGalleryForm
-     * @return
-     */
-    private ActionMessages validateImageGallery(ImageGalleryForm imageGalleryForm, HttpServletRequest request) {
-	ActionMessages errors = new ActionMessages();
-
-	// define it later mode(TEACHER) skip below validation.
-	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-	if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
-	    return errors;
-	}
-
-	return errors;
-    }
-
-    /**
      * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
      *
      * @param request
Index: lams_tool_images/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_tool_images/web/WEB-INF/struts-config.xml	23 Mar 2017 20:10:28 -0000	1.1.2.5
+++ lams_tool_images/web/WEB-INF/struts-config.xml	24 Mar 2017 16:37:10 -0000	1.1.2.6
@@ -85,16 +85,14 @@
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
-			<forward name="definelater" path="/pages/authoring/definelater.jsp" />
 		</action>
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.imageGallery.web.action.AuthoringAction"
 			name="imageGalleryForm" 
 			scope="request" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="author" path="/pages/authoring/authoring.jsp" />
-			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
+			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
 		<!-- ==========  Authroing Definitions: Add image methods ========== -->
 		<action path="/authoring/newImageInit"
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/authoring.jsp,v
diff -u -r1.6.2.8 -r1.6.2.9
--- lams_tool_images/web/pages/authoring/authoring.jsp	23 Mar 2017 20:10:28 -0000	1.6.2.8
+++ lams_tool_images/web/pages/authoring/authoring.jsp	24 Mar 2017 16:37:10 -0000	1.6.2.9
@@ -56,8 +56,8 @@
 	
 		<c:set var="title"><fmt:message key="label.learning.heading" /></c:set>
 		<lams:Page title="${title}" type="navbar">
-		
 			<html:hidden property="imageGallery.contentId"/>
+			<html:hidden property="mode" value="${mode}"/>
 			<html:hidden property="sessionMapID" />
 			<html:hidden property="contentFolderID" />
 			<html:hidden property="currentTab" styleId="currentTab" />
@@ -80,8 +80,7 @@
 				<div id="saveCancelButtons">
 					<lams:AuthoringButton formID="authoringForm"
 						clearSessionActionUrl="/clearsession.do" toolSignature="<%=ImageGalleryConstants.TOOL_SIGNATURE%>"
-						toolContentID="${formBean.imageGallery.contentId}"
-						accessMode="author"
+						toolContentID="${formBean.imageGallery.contentId}" accessMode="${mode}" defineLater="${mode=='teacher'}"
 						contentFolderID="${formBean.contentFolderID}" />
 				</div>
 			</lams:TabBodyArea>
Fisheye: Tag 1.3.2.4 refers to a dead (removed) revision in file `lams_tool_images/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	18 May 2016 17:46:33 -0000	1.5.2.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	24 Mar 2017 16:37:03 -0000	1.5.2.4
@@ -162,7 +162,7 @@
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	int itemIdx = NumberUtils.stringToInt(request.getParameter(CommonCartridgeConstants.PARAM_ITEM_INDEX), -1);
 	if (itemIdx != -1) {
@@ -194,7 +194,7 @@
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	int itemIdx = NumberUtils.stringToInt(request.getParameter(CommonCartridgeConstants.PARAM_ITEM_INDEX), -1);
 	CommonCartridgeItem item = null;
@@ -291,7 +291,7 @@
 	    HttpServletResponse response) {
 	//count uploaded resources
 	String sessionMapID = WebUtil.readStrParam(request, CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	List<CommonCartridgeItem> uploadedCartridgeResources = getUploadedCartridgeResources(sessionMap);
 	int countUploadedResources = uploadedCartridgeResources.size();
 
@@ -359,7 +359,7 @@
 	commonCartridgeForm.setContentFolderID(contentFolderID);
 
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	commonCartridgeForm.setSessionMapID(sessionMap.getSessionID());
 
@@ -425,7 +425,7 @@
     private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	CommonCartridgeForm existForm = (CommonCartridgeForm) sessionMap
 		.get(CommonCartridgeConstants.ATTR_RESOURCE_FORM);
 
@@ -437,11 +437,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(CommonCartridgeConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(CommonCartridgeConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+
+	return mapping.findForward(CommonCartridgeConstants.SUCCESS);
     }
 
     /**
@@ -460,20 +458,11 @@
 	CommonCartridgeForm commonCartridgeForm = (CommonCartridgeForm) form;
 
 	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(commonCartridgeForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(commonCartridgeForm.getSessionMapID());
 
 	ToolAccessMode mode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
-	ActionMessages errors = validate(commonCartridgeForm, mapping, request);
-	if (!errors.isEmpty()) {
-	    saveErrors(request, errors);
-	    if (mode.isAuthor()) {
-		return mapping.findForward("author");
-	    } else {
-		return mapping.findForward("monitor");
-	    }
-	}
-
 	CommonCartridge commonCartridge = commonCartridgeForm.getCommonCartridge();
 	ICommonCartridgeService service = getCommonCartridgeService();
 
@@ -485,18 +474,18 @@
 	    commonCartridgePO = commonCartridge;
 	    commonCartridgePO.setCreated(new Timestamp(new Date().getTime()));
 	    commonCartridgePO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = commonCartridgePO.getUid();
-		PropertyUtils.copyProperties(commonCartridgePO, commonCartridge);
-		// get back UID
-		commonCartridgePO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content (definelater)
-		commonCartridgePO.setInstructions(commonCartridge.getInstructions());
-		commonCartridgePO.setTitle(commonCartridge.getTitle());
-		// change define later status
+	    Long uid = commonCartridgePO.getUid();
+	    PropertyUtils.copyProperties(commonCartridgePO, commonCartridge);
+	    // get back UID
+	    commonCartridgePO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
 		commonCartridgePO.setDefineLater(false);
 	    }
+	    
 	    commonCartridgePO.setUpdated(new Timestamp(new Date().getTime()));
 	}
 
@@ -549,11 +538,7 @@
 	commonCartridgeForm.setCommonCartridge(commonCartridgePO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	return mapping.findForward(CommonCartridgeConstants.SUCCESS);
     }
 
     // *************************************************************************************
@@ -574,7 +559,7 @@
      * @param request
      * @return
      */
-    private List<CommonCartridgeItem> getUploadedCartridgeResources(SessionMap sessionMap) {
+    private List<CommonCartridgeItem> getUploadedCartridgeResources(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, "uploadedCartridgeResources");
     }
 
@@ -584,7 +569,7 @@
      * @param request
      * @return
      */
-    private SortedSet<CommonCartridgeItem> getCommonCartridgeItemList(SessionMap sessionMap) {
+    private SortedSet<CommonCartridgeItem> getCommonCartridgeItemList(SessionMap<String, Object> sessionMap) {
 	SortedSet<CommonCartridgeItem> list = (SortedSet<CommonCartridgeItem>) sessionMap
 		.get(CommonCartridgeConstants.ATTR_RESOURCE_ITEM_LIST);
 	if (list == null) {
@@ -600,7 +585,7 @@
      * @param request
      * @return
      */
-    private List getDeletedCommonCartridgeItemList(SessionMap sessionMap) {
+    private List getDeletedCommonCartridgeItemList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, CommonCartridgeConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
     }
 
@@ -611,7 +596,7 @@
      * @param name
      * @return
      */
-    private List getListFromSession(SessionMap sessionMap, String name) {
+    private List getListFromSession(SessionMap<String, Object> sessionMap, String name) {
 	List list = (List) sessionMap.get(name);
 	if (list == null) {
 	    list = new ArrayList();
@@ -717,7 +702,7 @@
 	    //item.setDescription(itemForm.getDescription());
 	}
 
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(itemForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(itemForm.getSessionMapID());
 	List<CommonCartridgeItem> uploadedCartridgeResources = getUploadedCartridgeResources(sessionMap);
 	uploadedCartridgeResources.clear();
 	uploadedCartridgeResources.addAll(items);
@@ -738,7 +723,7 @@
 	 * be set when persisting this commonCartridge item.
 	 */
 
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(itemForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(itemForm.getSessionMapID());
 	// check whether it is "edit(old item)" or "add(new item)"
 	SortedSet<CommonCartridgeItem> commonCartridgeList = getCommonCartridgeItemList(sessionMap);
 	int itemIdx = NumberUtils.stringToInt(itemForm.getItemIndex(), -1);
@@ -842,25 +827,6 @@
 	return mode;
     }
 
-    private ActionMessages validate(CommonCartridgeForm commonCartridgeForm, ActionMapping mapping,
-	    HttpServletRequest request) {
-	ActionMessages errors = new ActionMessages();
-	// if (StringUtils.isBlank(commonCartridgeForm.getCommonCartridge().getTitle())) {
-	// ActionMessage error = new ActionMessage("error.resource.item.title.blank");
-	// errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-	// }
-
-	// define it later mode(TEACHER) skip below validation.
-	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-	if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
-	    return errors;
-	}
-
-	// Some other validation outside basic Tab.
-
-	return errors;
-    }
-
     public ActionForward initPedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	CommonCartridgePedagogicalPlannerForm plannerForm = (CommonCartridgePedagogicalPlannerForm) form;
Index: lams_tool_imscc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_tool_imscc/web/WEB-INF/struts-config.xml	28 Feb 2017 17:13:32 -0000	1.1.2.4
+++ lams_tool_imscc/web/WEB-INF/struts-config.xml	24 Mar 2017 16:37:02 -0000	1.1.2.5
@@ -81,16 +81,14 @@
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
-			<forward name="definelater" path="/pages/authoring/definelater.jsp" />
 		</action>
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.commonCartridge.web.action.AuthoringAction"
 			name="commonCartridgeForm" 
 			scope="request" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="author" path="/pages/authoring/authoring.jsp" />
-			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
+			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
 		<!-- ==========  CommonCartridge Item : URL ========== -->
 		<action path="/authoring/newItemInit"
Index: lams_tool_imscc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/authoring.jsp,v
diff -u -r1.6.2.3 -r1.6.2.4
--- lams_tool_imscc/web/pages/authoring/authoring.jsp	11 Nov 2016 15:52:22 -0000	1.6.2.3
+++ lams_tool_imscc/web/pages/authoring/authoring.jsp	24 Mar 2017 16:37:03 -0000	1.6.2.4
@@ -73,6 +73,7 @@
 		<lams:Page title="${title}" type="navbar">
 		
 			<html:hidden property="commonCartridge.contentId" />
+			<html:hidden property="mode" value="${mode}"/>
 			<html:hidden property="sessionMapID" />
 			<html:hidden property="contentFolderID" />
 			<html:hidden property="currentTab" styleId="currentTab" />
@@ -96,7 +97,7 @@
 					<lams:AuthoringButton formID="authoringForm"
 						clearSessionActionUrl="/clearsession.do" toolSignature="<%=CommonCartridgeConstants.TOOL_SIGNATURE%>"
 						toolContentID="${formBean.commonCartridge.contentId}"
-						accessMode="author"
+						accessMode="${mode}" defineLater="${mode=='teacher'}"
 						contentFolderID="${formBean.contentFolderID}" />
 				</div>
 			</lams:TabBodyArea>
Fisheye: Tag 1.4.2.3 refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java	27 Feb 2017 09:15:33 -0000	1.1.2.3
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java	24 Mar 2017 16:37:17 -0000	1.1.2.4
@@ -179,11 +179,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(PeerreviewConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(PeerreviewConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+
+	return mapping.findForward(PeerreviewConstants.SUCCESS);
     }
 
     /**
@@ -206,41 +204,30 @@
 		.getAttribute(peerreviewForm.getSessionMapID());
 
 	ToolAccessMode mode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
-	ActionMessages errors = validate(peerreviewForm, mapping, request);
-	if (!errors.isEmpty()) {
-	    saveErrors(request, errors);
-	    if (mode.isAuthor()) {
-		return mapping.findForward("author");
-	    } else {
-		return mapping.findForward("monitor");
-	    }
-	}
-
 	Peerreview peerreview = peerreviewForm.getPeerreview();
 	IPeerreviewService service = getPeerreviewService();
 
-	// **********************************Get Peerreview
-	// PO*********************
+	// **********************************Get Peerreview PO*********************
 	Peerreview peerreviewPO = service.getPeerreviewByContentId(peerreviewForm.getPeerreview().getContentId());
 	if (peerreviewPO == null) {
-	    // new Peerreview, create it.
+	    // new Peerreview, create it
 	    peerreviewPO = peerreview;
 	    peerreviewPO.setCreated(new Timestamp(new Date().getTime()));
 	    peerreviewPO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = peerreviewPO.getUid();
-		PropertyUtils.copyProperties(peerreviewPO, peerreview);
-		// get back UID
-		peerreviewPO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content
-		// (definelater)
-		peerreviewPO.setInstructions(peerreview.getInstructions());
-		peerreviewPO.setTitle(peerreview.getTitle());
-		// change define later status
+	    Long uid = peerreviewPO.getUid();
+	    PropertyUtils.copyProperties(peerreviewPO, peerreview);
+	    // get back UID
+	    peerreviewPO.setUid(uid);
+		
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
 		peerreviewPO.setDefineLater(false);
 	    }
+	    
 	    peerreviewPO.setUpdated(new Timestamp(new Date().getTime()));
 	}
 
@@ -268,11 +255,7 @@
 	peerreviewForm.setPeerreview(peerreviewPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	return mapping.findForward(PeerreviewConstants.SUCCESS);
     }
 
     // *************************************************************************************
@@ -305,23 +288,4 @@
 	return mode;
     }
 
-    private ActionMessages validate(PeerreviewForm peerreviewForm, ActionMapping mapping, HttpServletRequest request) {
-	ActionMessages errors = new ActionMessages();
-	// if (StringUtils.isBlank(peerreviewForm.getPeerreview().getTitle())) {
-	// ActionMessage error = new
-	// ActionMessage("error.resource.item.title.blank");
-	// errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-	// }
-
-	// define it later mode(TEACHER) skip below validation.
-	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-	if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
-	    return errors;
-	}
-
-	// Some other validation outside basic Tab.
-
-	return errors;
-    }
-
 }
Index: lams_tool_preview/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.12 -r1.1.2.13
--- lams_tool_preview/web/WEB-INF/struts-config.xml	28 Feb 2017 17:13:30 -0000	1.1.2.12
+++ lams_tool_preview/web/WEB-INF/struts-config.xml	24 Mar 2017 16:37:17 -0000	1.1.2.13
@@ -69,16 +69,14 @@
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
-			<forward name="definelater" path="/pages/authoring/definelater.jsp" />
 		</action>
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.AuthoringAction"
 			name="peerreviewForm" 
 			scope="request" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="author" path="/pages/authoring/authoring.jsp" />
-			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
+			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/start"
Index: lams_tool_preview/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/authoring/authoring.jsp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_preview/web/pages/authoring/authoring.jsp	17 May 2016 04:38:43 -0000	1.1.2.3
+++ lams_tool_preview/web/pages/authoring/authoring.jsp	24 Mar 2017 16:37:17 -0000	1.1.2.4
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-        
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants"%>
@@ -29,19 +28,17 @@
 	    	selectTab(tabId);
         }
     </script>
-    
 </lams:head>
 <body class="stripes" onLoad="init()">
+<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" scope="request"/>		
+	<html:hidden property="peerreview.contentId" />
+	<html:hidden property="mode" value="${mode}"/>
+	<html:hidden property="sessionMapID" />
+	<html:hidden property="contentFolderID" />
+	<html:hidden property="currentTab" styleId="currentTab" />
 
-	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" scope="request"/>
-		
-		<html:hidden property="peerreview.contentId" />
-		<html:hidden property="sessionMapID" />
-		<html:hidden property="contentFolderID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Page title="${title}" type="navbar">
 
@@ -73,15 +70,14 @@
 			--%>
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 				toolSignature="<%=PeerreviewConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.peerreview.contentId}" 
-				 customiseSessionID="${formBean.sessionMapID}"
+				 customiseSessionID="${formBean.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
 				 contentFolderID="${formBean.contentFolderID}" />
 		</lams:TabBodyArea>
 
 		<div id="footer"></div>
 		
 	</lams:Page>
 	
-	</html:form>
-
+</html:form>
 </body>
 </lams:html>
Fisheye: Tag 1.1.2.4 refers to a dead (removed) revision in file `lams_tool_preview/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java	11 May 2016 07:37:36 -0000	1.4.2.2
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java	24 Mar 2017 16:36:59 -0000	1.4.2.3
@@ -38,7 +38,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
@@ -125,7 +124,7 @@
 	spreadsheetForm.setContentFolderID(contentFolderID);
 
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	spreadsheetForm.setSessionMapID(sessionMap.getSessionID());
 
@@ -160,7 +159,7 @@
     private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	SpreadsheetForm existForm = (SpreadsheetForm) sessionMap.get(SpreadsheetConstants.ATTR_RESOURCE_FORM);
 
 	SpreadsheetForm spreadsheetForm = (SpreadsheetForm) form;
@@ -171,11 +170,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(SpreadsheetConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(SpreadsheetConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+
+	return mapping.findForward(SpreadsheetConstants.SUCCESS);
     }
 
     /**
@@ -192,21 +189,9 @@
 	    HttpServletResponse response) throws Exception {
 	SpreadsheetForm spreadsheetForm = (SpreadsheetForm) (form);
 
-	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(spreadsheetForm.getSessionMapID());
-
 	ToolAccessMode mode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
-	ActionMessages errors = validate(spreadsheetForm, mapping, request);
-	if (!errors.isEmpty()) {
-	    saveErrors(request, errors);
-	    if (mode.isAuthor()) {
-		return mapping.findForward("author");
-	    } else {
-		return mapping.findForward("monitor");
-	    }
-	}
-
 	Spreadsheet spreadsheet = spreadsheetForm.getSpreadsheet();
 	ISpreadsheetService service = getSpreadsheetService();
 
@@ -217,19 +202,18 @@
 	    spreadsheetPO = spreadsheet;
 	    spreadsheetPO.setCreated(new Timestamp(new Date().getTime()));
 	    spreadsheetPO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = spreadsheetPO.getUid();
-		PropertyUtils.copyProperties(spreadsheetPO, spreadsheet);
-		// get back UID
-		spreadsheetPO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content (definelater)
-		spreadsheetPO.setInstructions(spreadsheet.getInstructions());
-		spreadsheetPO.setCode(spreadsheet.getCode());
-		spreadsheetPO.setTitle(spreadsheet.getTitle());
-		// change define later status
+	    Long uid = spreadsheetPO.getUid();
+	    PropertyUtils.copyProperties(spreadsheetPO, spreadsheet);
+	    // get back UID
+	    spreadsheetPO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
 		spreadsheetPO.setDefineLater(false);
 	    }
+
 	    spreadsheetPO.setUpdated(new Timestamp(new Date().getTime()));
 	}
 
@@ -252,11 +236,7 @@
 	spreadsheetForm.setSpreadsheet(spreadsheetPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	return mapping.findForward(SpreadsheetConstants.SUCCESS);
     }
 
     // *************************************************************************************
@@ -288,23 +268,4 @@
 	return mode;
     }
 
-    private ActionMessages validate(SpreadsheetForm spreadsheetForm, ActionMapping mapping,
-	    HttpServletRequest request) {
-	ActionMessages errors = new ActionMessages();
-	// if (StringUtils.isBlank(spreadsheetForm.getSpreadsheet().getTitle())) {
-	// ActionMessage error = new ActionMessage("error.resource.item.title.blank");
-	// errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-	// }
-
-	// define it later mode(TEACHER) skip below validation.
-	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-	if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
-	    return errors;
-	}
-
-	// Some other validation outside basic Tab.
-
-	return errors;
-    }
-
 }
Index: lams_tool_spreadsheet/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_spreadsheet/web/WEB-INF/struts-config.xml	28 Feb 2017 17:13:26 -0000	1.1.2.3
+++ lams_tool_spreadsheet/web/WEB-INF/struts-config.xml	24 Mar 2017 16:36:59 -0000	1.1.2.4
@@ -73,16 +73,14 @@
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
-			<forward name="definelater" path="/pages/authoring/definelater.jsp" />
 		</action>
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.AuthoringAction"
 			name="spreadsheetForm" 
 			scope="request" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="author" path="/pages/authoring/authoring.jsp" />
-			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
+			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
 
 		<!-- ==========  Review Item  ========== -->
Index: lams_tool_spreadsheet/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/authoring/authoring.jsp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	27 Feb 2017 08:44:32 -0000	1.5.2.3
+++ lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	24 Mar 2017 16:36:59 -0000	1.5.2.4
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
-        
+
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants"%>
-
 <c:set var="spreadsheetURL"><html:rewrite page="/includes/javascript/simple_spreadsheet/spreadsheet_offline.html"/>?lang=${pageContext.response.locale.language}</c:set>
 
 <lams:html>
@@ -35,20 +34,17 @@
     	}
     	var spreadsheetCode = "${sessionMap.code}";
         
-    </script>
-	<!-- ******************** END CK Editor related javascript & HTML ********************** -->
-
- 
+    </script> 
 </lams:head>
 <body class="stripes" onLoad="init()">
+<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data" onsubmit="return onSubmitHandler();">
+	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+	<html:hidden property="spreadsheet.contentId" />
+	 <html:hidden property="mode" value="${mode}"/>
+	<html:hidden property="sessionMapID" />
+	<html:hidden property="contentFolderID" />
+	<html:hidden property="currentTab" styleId="currentTab" />
 
-	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data" onsubmit="return onSubmitHandler();">
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="spreadsheet.contentId" />
-		<html:hidden property="sessionMapID" />
-		<html:hidden property="contentFolderID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-
 	<c:set var="title"><fmt:message key="activity.title"/> ${lang}</c:set>
 	<lams:Page title="${title}" type="navbar">
 
@@ -74,13 +70,12 @@
 		<!-- Button Row -->
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 			toolSignature="<%=SpreadsheetConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.spreadsheet.contentId}" 
-			 customiseSessionID="${formBean.sessionMapID}"
+			 customiseSessionID="${formBean.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
 			 contentFolderID="${formBean.contentFolderID}" />
 		</lams:TabBodyArea>
 
 		<div id="footer"></div>
 	</lams:Page>	
-	</html:form>
-
+</html:form>
 </body>
 </lams:html>
Fisheye: Tag 1.4.2.3 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java,v
diff -u -r1.20.2.3 -r1.20.2.4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	11 May 2016 07:35:22 -0000	1.20.2.3
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	24 Mar 2017 16:36:56 -0000	1.20.2.4
@@ -183,7 +183,7 @@
 	taskListForm.setContentFolderID(contentFolderID);
 
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	taskListForm.setSessionMapID(sessionMap.getSessionID());
 
@@ -254,7 +254,7 @@
     private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	TaskListForm existForm = (TaskListForm) sessionMap.get(TaskListConstants.ATTR_TASKLIST_FORM);
 
 	TaskListForm taskListForm = (TaskListForm) form;
@@ -265,11 +265,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(TaskListConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(TaskListConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	
+	return mapping.findForward(TaskListConstants.SUCCESS);
     }
 
     /**
@@ -287,42 +285,33 @@
 	TaskListForm taskListForm = (TaskListForm) form;
 
 	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(taskListForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(taskListForm.getSessionMapID());
 
 	ToolAccessMode mode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
-	ActionMessages errors = validate(taskListForm, mapping, request);
-	if (!errors.isEmpty()) {
-	    saveErrors(request, errors);
-	    if (mode.isAuthor()) {
-		return mapping.findForward("author");
-	    } else {
-		return mapping.findForward("monitor");
-	    }
-	}
-
 	TaskList taskList = taskListForm.getTaskList();
 	ITaskListService service = getTaskListService();
 
 	// **********************************Get TaskList PO*********************
 	TaskList taskListPO = service.getTaskListByContentId(taskListForm.getTaskList().getContentId());
 	if (taskListPO == null) {
-	    // new TaskList, create it.
+	    // new TaskList, create it
 	    taskListPO = taskList;
 	    taskListPO.setCreated(new Timestamp(new Date().getTime()));
 	    taskListPO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = taskListPO.getUid();
-		PropertyUtils.copyProperties(taskListPO, taskList);
-		// get back UID
-		taskListPO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content (definelater)
-		taskListPO.setInstructions(taskList.getInstructions());
-		taskListPO.setTitle(taskList.getTitle());
-		// change define later status
+	    Long uid = taskListPO.getUid();
+	    PropertyUtils.copyProperties(taskListPO, taskList);
+	    // get back UID
+	    taskListPO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
 		taskListPO.setDefineLater(false);
 	    }
+
 	    taskListPO.setUpdated(new Timestamp(new Date().getTime()));
 	}
 
@@ -411,11 +400,7 @@
 	taskListForm.setTaskList(taskListPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	return mapping.findForward(TaskListConstants.SUCCESS);
     }
 
     // **********************************************************
@@ -453,7 +438,7 @@
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	int itemIdx = NumberUtils.stringToInt(request.getParameter(TaskListConstants.PARAM_ITEM_INDEX), -1);
 	TaskListItem item = null;
@@ -524,7 +509,7 @@
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	int itemIdx = NumberUtils.stringToInt(request.getParameter(TaskListConstants.PARAM_ITEM_INDEX), -1);
 	if (itemIdx != -1) {
@@ -583,7 +568,7 @@
     private ActionForward switchItem(ActionMapping mapping, HttpServletRequest request, boolean up) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	int itemIdx = NumberUtils.stringToInt(request.getParameter(TaskListConstants.PARAM_ITEM_INDEX), -1);
 	if (itemIdx != -1) {
@@ -628,7 +613,7 @@
      * @param request
      * @return
      */
-    private SortedSet<TaskListItem> getTaskListItemList(SessionMap sessionMap) {
+    private SortedSet<TaskListItem> getTaskListItemList(SessionMap<String, Object> sessionMap) {
 	SortedSet<TaskListItem> list = (SortedSet<TaskListItem>) sessionMap
 		.get(TaskListConstants.ATTR_TASKLIST_ITEM_LIST);
 	if (list == null) {
@@ -644,7 +629,7 @@
      * @param request
      * @return
      */
-    private SortedSet<TaskListCondition> getTaskListConditionList(SessionMap sessionMap) {
+    private SortedSet<TaskListCondition> getTaskListConditionList(SessionMap<String, Object> sessionMap) {
 	SortedSet<TaskListCondition> list = (SortedSet<TaskListCondition>) sessionMap
 		.get(TaskListConstants.ATTR_CONDITION_LIST);
 	if (list == null) {
@@ -660,7 +645,7 @@
      * @param request
      * @return
      */
-    private List getDeletedTaskListConditionList(SessionMap sessionMap) {
+    private List getDeletedTaskListConditionList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, TaskListConstants.ATTR_DELETED_CONDITION_LIST);
     }
 
@@ -670,7 +655,7 @@
      * @param request
      * @return
      */
-    private List getDeletedTaskListItemList(SessionMap sessionMap) {
+    private List getDeletedTaskListItemList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, TaskListConstants.ATTR_DELETED_TASKLIST_ITEM_LIST);
     }
 
@@ -681,7 +666,7 @@
      * @param name
      * @return
      */
-    private List getListFromSession(SessionMap sessionMap, String name) {
+    private List getListFromSession(SessionMap<String, Object> sessionMap, String name) {
 	List list = (List) sessionMap.get(name);
 	if (list == null) {
 	    list = new ArrayList();
@@ -731,7 +716,7 @@
 	 * this taskList item.
 	 */
 
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(itemForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(itemForm.getSessionMapID());
 	// check whether it is "edit(old item)" or "add(new item)"
 	SortedSet<TaskListItem> taskListList = getTaskListItemList(sessionMap);
 	int itemIdx = NumberUtils.stringToInt(itemForm.getItemIndex(), -1);
@@ -801,24 +786,6 @@
 	return mode;
     }
 
-    private ActionMessages validate(TaskListForm taskListForm, ActionMapping mapping, HttpServletRequest request) {
-	ActionMessages errors = new ActionMessages();
-	// if (StringUtils.isBlank(taskListForm.getTaskList().getTitle())) {
-	// ActionMessage error = new ActionMessage("error.resource.item.title.blank");
-	// errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-	// }
-
-	// define it later mode(TEACHER) skip below validation.
-	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-	if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
-	    return errors;
-	}
-
-	// Some other validation outside basic Tab.
-
-	return errors;
-    }
-
     public ActionForward initPedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	TaskListPedagogicalPlannerForm plannerForm = (TaskListPedagogicalPlannerForm) form;
Index: lams_tool_task/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_task/web/WEB-INF/struts-config.xml	28 Feb 2017 17:13:24 -0000	1.1.2.2
+++ lams_tool_task/web/WEB-INF/struts-config.xml	24 Mar 2017 16:36:56 -0000	1.1.2.3
@@ -81,16 +81,14 @@
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
-			<forward name="definelater" path="/pages/authoring/definelater.jsp" />
 		</action>
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.AuthoringAction"
 			name="taskListForm" 
 			scope="request" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="author" path="/pages/authoring/authoring.jsp" />
-			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
+			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
 		<!-- ==========  Authoring Definitions: Add taskListItem methods ========== -->
 		<action path="/authoring/newItemInit"
Index: lams_tool_task/web/common/monitorheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/common/Attic/monitorheader.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_task/web/common/monitorheader.jsp	3 Jun 2016 00:18:11 -0000	1.1.2.1
+++ lams_tool_task/web/common/monitorheader.jsp	24 Mar 2017 16:36:56 -0000	1.1.2.2
@@ -3,23 +3,24 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
- 	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/taskList.css'/>" rel="stylesheet" type="text/css">
-	<lams:css/>
+ <!-- ********************  CSS ********************** -->
+<link href="<html:rewrite page='/includes/css/taskList.css'/>" rel="stylesheet" type="text/css">
+<lams:css/>
+<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
 
- 	<!-- ********************  javascript ********************** -->
-<%-- 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
- --%>	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 	
-	<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
+
 	
\ No newline at end of file
Index: lams_tool_task/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/authoring/authoring.jsp,v
diff -u -r1.8.2.3 -r1.8.2.4
--- lams_tool_task/web/pages/authoring/authoring.jsp	3 Jun 2016 00:18:11 -0000	1.8.2.3
+++ lams_tool_task/web/pages/authoring/authoring.jsp	24 Mar 2017 16:36:56 -0000	1.8.2.4
@@ -1,10 +1,8 @@
 <!DOCTYPE html>
-        
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.taskList.TaskListConstants"%>
 
-
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.authoring.title" /></title>
@@ -18,7 +16,6 @@
 	    		selectTab(tag.value);
             else
                 selectTab(1); //select the default tab;
-          
         }     
         
         function doSelectTab(tabId) {
@@ -67,10 +64,10 @@
 </lams:head>
 
 <body class="stripes" onLoad="init()">
-
-	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	<html:hidden property="taskList.contentId" />
+	<html:hidden property="mode" value="${mode}"/>
 	<html:hidden property="sessionMapID" />
 	<html:hidden property="contentFolderID" />
 	<html:hidden property="currentTab" styleId="currentTab" />
@@ -111,19 +108,18 @@
 		
 					<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 						toolSignature="<%=TaskListConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.taskList.contentId}" 
-						 customiseSessionID="${formBean.sessionMapID}"
+						 customiseSessionID="${formBean.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
 						 contentFolderID="${formBean.contentFolderID}" />
 			</lams:TabBodyArea>
 	
 			<div id="footer"></div>
 
 		</lams:Page>	
-	</html:form>
+</html:form>
 
 <script type="text/javascript">
 	changeMinTasks(${formBean.taskList.minimumNumberTasks});
 </script>
 
-
 </body>
 </lams:html>
Fisheye: Tag 1.5.2.3 refers to a dead (removed) revision in file `lams_tool_task/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- lams_tool_task/web/pages/monitoring/monitoring.jsp	13 Dec 2016 22:59:00 -0000	1.5.2.4
+++ lams_tool_task/web/pages/monitoring/monitoring.jsp	24 Mar 2017 16:36:56 -0000	1.5.2.5
@@ -1,19 +1,16 @@
 <!DOCTYPE html>
-        
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.taskList.TaskListConstants"%>
-
-<lams:html>
-	<lams:head>
-	
 		<%-- param has higher level for request attribute --%>
 		<c:if test="${not empty param.sessionMapID}">
 			<c:set var="sessionMapID" value="${param.sessionMapID}" />
 		</c:if>
 	
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 		
+<lams:html>
+	<lams:head>
 	
 		<script type="text/javascript">
 			//pass settings to monitorToolSummaryAdvanced.js
@@ -28,7 +25,6 @@
 				messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
 			};
 		</script>
-	
 		<%@ include file="/common/monitorheader.jsp" %>
 		
 		<style media="screen,projection" type="text/css">
@@ -48,7 +44,6 @@
 		</style>
 		
 		<script>
-
 	        function init(){
 	        	var initialTabId = "${initialTabId}";
 			 	if (initialTabId) {