Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -186,7 +186,7 @@
     public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release";
 
     // for condition management
-    public static final Object ATTR_CONDITION_SET = "conditionList";
+    public static final String ATTR_CONDITION_SET = "conditionList";
     public static final String PARAM_ORDER_ID = "orderId";
     public static final String ATTR_DELETED_CONDITION_LIST = "deletedConditionList";
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r0b0cbd0f4149520b777cd5f085c2c05c43f6f7e2 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0b0cbd0f4149520b777cd5f085c2c05c43f6f7e2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -81,7 +81,6 @@
 
 /**
  * @author Steve.Ni
- * @version $Revision$
  */
 public class AuthoringAction extends Action {
     private static Logger log = Logger.getLogger(AuthoringAction.class);
@@ -107,12 +106,6 @@
 	    Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 	    Forum forum = forumService.getForumByContentId(contentId);
 
-	    boolean isForumEditable = ForumWebUtils.isForumEditable(forum);
-	    if (!isForumEditable) {
-		request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable));
-		return mapping.findForward("forbidden");
-	    }
-
 	    if (!forum.isContentInUse()) {
 		forum.setDefineLater(true);
 		forumService.updateForum(forum);
@@ -176,7 +169,7 @@
     protected ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
 	Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
@@ -258,6 +251,9 @@
 	SortedSet<ForumCondition> conditionSet = getForumConditionSet(sessionMap);
 	conditionSet.clear();
 	conditionSet.addAll(forum.getConditions());
+	
+	ToolAccessMode mode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
 	return mapping.findForward("success");
     }
@@ -286,17 +282,15 @@
 	    throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 
 	ToolAccessMode mode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	
 	ForumForm forumForm = (ForumForm) form;
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(forumForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(forumForm.getSessionMapID());
 	// validation
 	ActionMessages errors = validate(forumForm, mapping, request);
 	if (!errors.isEmpty()) {
 	    saveErrors(request, errors);
-	    if (mode.isAuthor()) {
-		return mapping.findForward("author");
-	    } else {
-		return mapping.findForward("monitor");
-	    }
+	    return mapping.findForward("success");
 	}
 
 	Forum forum = forumForm.getForum();
@@ -326,17 +320,15 @@
 	    // new Forum, create it.
 	    forumPO = forum;
 	    forumPO.setContentId(forumForm.getToolContentID());
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = forumPO.getUid();
-		PropertyUtils.copyProperties(forumPO, forum);
-		// get back UID
-		forumPO.setUid(uid);
-	    } else {
-		// if it is Teacher, then just update basic tab content (definelater)
-		forumPO.setInstructions(forum.getInstructions());
-		forumPO.setTitle(forum.getTitle());
-		// change define later status
+	    Long uid = forumPO.getUid();
+	    PropertyUtils.copyProperties(forumPO, forum);
+	    // get back UID
+	    forumPO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
 		forumPO.setDefineLater(false);
 	    }
 	}
@@ -408,11 +400,7 @@
 	forum = forumService.updateForum(forum);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	return mapping.findForward("success");
     }
 
     // ******************************************************************************************************************
@@ -451,7 +439,7 @@
     public ActionForward createTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException, PersistenceException {
 	MessageForm messageForm = (MessageForm) form;
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(messageForm.getSessionMapID());
 	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
 
 	SortedSet topics = getTopics(sessionMap);
@@ -533,7 +521,7 @@
 	    HttpServletResponse response) throws PersistenceException {
 	// get SessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	String topicIndex = request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
 	int topicIdx = NumberUtils.stringToInt(topicIndex, -1);
@@ -579,7 +567,7 @@
 
 	// get SessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	MessageForm msgForm = (MessageForm) form;
 	msgForm.setSessionMapID(sessionMapID);
@@ -616,7 +604,7 @@
     public ActionForward updateTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws PersistenceException {
 	MessageForm messageForm = (MessageForm) form;
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(messageForm.getSessionMapID());
 	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
 
 	// get param from HttpServletRequest
@@ -707,7 +695,7 @@
     private ActionForward switchTopic(ActionMapping mapping, HttpServletRequest request, boolean up) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.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(ForumConstants.AUTHORING_TOPICS_INDEX), -1);
 	if (itemIdx != -1) {
@@ -752,7 +740,7 @@
      * @param request
      * @return
      */
-    private SortedSet<MessageDTO> getTopics(SessionMap sessionMap) {
+    private SortedSet<MessageDTO> getTopics(SessionMap<String, Object> sessionMap) {
 	SortedSet<MessageDTO> topics = (SortedSet<MessageDTO>) sessionMap.get(ForumConstants.AUTHORING_TOPICS_LIST);
 	if (topics == null) {
 	    topics = new TreeSet<MessageDTO>(new MessageDtoComparator());
@@ -765,15 +753,15 @@
      * @param request
      * @return
      */
-    private List getTopicDeletedAttachmentList(SessionMap sessionMap) {
+    private List getTopicDeletedAttachmentList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, ForumConstants.DELETED_ATTACHMENT_LIST);
     }
 
     /**
      * @param request
      * @return
      */
-    private List getDeletedTopicList(SessionMap sessionMap) {
+    private List getDeletedTopicList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, ForumConstants.DELETED_AUTHORING_TOPICS_LIST);
     }
 
@@ -784,7 +772,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();
@@ -818,7 +806,7 @@
 	    javax.servlet.http.HttpServletRequest request) {
 	ActionMessages errors = new ActionMessages();
 
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(form.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(form.getSessionMapID());
 	ActionMessage ae;
 	try {
 	    String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
@@ -908,7 +896,7 @@
      * @param request
      * @return
      */
-    private SortedSet<ForumCondition> getForumConditionSet(SessionMap sessionMap) {
+    private SortedSet<ForumCondition> getForumConditionSet(SessionMap<String, Object> sessionMap) {
 	SortedSet<ForumCondition> list = (SortedSet<ForumCondition>) sessionMap.get(ForumConstants.ATTR_CONDITION_SET);
 	if (list == null) {
 	    list = new TreeSet<ForumCondition>(new TextSearchConditionComparator());
@@ -923,7 +911,7 @@
      * @param request
      * @return
      */
-    private List getDeletedForumConditionList(SessionMap sessionMap) {
+    private List getDeletedForumConditionList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, ForumConstants.ATTR_DELETED_CONDITION_LIST);
     }
 
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r14c269dab2fd9de7863a2074fd5ee1561215d066 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 14c269dab2fd9de7863a2074fd5ee1561215d066)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -67,7 +67,7 @@
 			scope="request" 
 			validate="false"
 			parameter="defineLater">
-			<forward name="success" path="tiles:/monitoring/forum/defineLater" />
+			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 		<!-- ========== BEGIN: Authroing Definitions ============================== -->
 		<action path="/authoring"
@@ -83,8 +83,7 @@
 			name="forumForm" 
 			scope="request" 			parameter="updateContent" 
 			validate="false">
-			<forward name="author" path="tiles:/authoring/forum/main" />
-			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
+			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 
 		<!--  ================= topics  =================  -->	
Index: lams_tool_forum/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -r14c269dab2fd9de7863a2074fd5ee1561215d066 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_forum/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 14c269dab2fd9de7863a2074fd5ee1561215d066)
+++ lams_tool_forum/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -105,12 +105,6 @@
 		<put name="header" value="/jsps/monitoring/header.jsp"/>    	
     		<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
 	</definition>
-	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:tab:layout">
-    		<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
-    		<put name="header" value="/jsps/authoring/definelaterheader.jsp"/>
-    		<put name="body" value="/jsps/authoring/definelater.jsp"/>
-	</definition>
-	
 	<definition name="tiles:/monitoring/forum/viewMark" extends="tiles:layout">
     		<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
     		<put name="body" value="/jsps/monitoring/viewmarks.jsp"/>
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r3fdabbd4fd71b902c9aca305ed538d66c8762070 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3fdabbd4fd71b902c9aca305ed538d66c8762070)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -15,48 +15,48 @@
 		
 		return true;
 	}
-	
-	
 </script>
 
-<html:form action="authoring/update" method="post"
-	styleId="authoringForm" enctype="multipart/form-data" onsubmit="return verifyAllowRateMessagesCheckbox();">
+<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data" 
+		onsubmit="return verifyAllowRateMessagesCheckbox();">
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<html:hidden property="toolContentID" />
 	<html:hidden property="sessionMapID" />
 	<html:hidden property="contentFolderID" />
 	<html:hidden property="currentTab" styleId="currentTab" />
-	<input type="hidden" name="mode" value="author">
+	<html:hidden property="mode" value="${mode}"/>
 	
-<c:set var="title"><fmt:message key="activity.title" /></c:set>
-<lams:Page title="${title}" type="navbar">
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+		
+		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ForumConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+			<lams:Tab id="1" key="authoring.tab.basic" />
+			<lams:Tab id="2" key="authoring.tab.advanced" />
+			<lams:Tab id="3" key="authoring.tab.conditions" />
+		</lams:Tabs> 
 	
-	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ForumConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-		<lams:Tab id="1" key="authoring.tab.basic" />
-		<lams:Tab id="2" key="authoring.tab.advanced" />
-		<lams:Tab id="3" key="authoring.tab.conditions" />
-	</lams:Tabs>    
-
-	<lams:TabBodyArea>
-		<%@ include file="/common/messages.jsp"%>
-	   
-	    <!--  Set up tabs  -->
-	     <lams:TabBodys>
-			<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
-			<lams:TabBody id="2" titleKey="authoring.tab.advanced" page="advance.jsp" />
-			<lams:TabBody id="3" titleKey="authoring.tab.conditions" page="conditions.jsp" />
-	    </lams:TabBodys>
-	
-		<!-- Button Row -->
-		<lams:AuthoringButton formID="authoringForm"
-			clearSessionActionUrl="/clearsession.do"
-			toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>"
-			toolContentID="${formBean.toolContentID}"
-			customiseSessionID="${formBean.sessionMapID}"
-			contentFolderID="${formBean.contentFolderID}" />
-	</lams:TabBodyArea>
-           		
-    <div id="footer"></div>
-    
-</lams:Page>
+		<lams:TabBodyArea>
+			<%@ include file="/common/messages.jsp"%>
+		   
+		    <!--  Set up tabs  -->
+		     <lams:TabBodys>
+				<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
+				<lams:TabBody id="2" titleKey="authoring.tab.advanced" page="advance.jsp" />
+				<lams:TabBody id="3" titleKey="authoring.tab.conditions" page="conditions.jsp" />
+		    </lams:TabBodys>
+		
+			<!-- Button Row -->
+			<lams:AuthoringButton formID="authoringForm"
+				clearSessionActionUrl="/clearsession.do"
+				toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>"
+				toolContentID="${formBean.toolContentID}"
+				customiseSessionID="${formBean.sessionMapID}"
+				contentFolderID="${formBean.contentFolderID}" 
+				accessMode="${mode}" 
+				defineLater="${mode=='teacher'}"/>
+		</lams:TabBodyArea>
+	           		
+	    <div id="footer"></div>
+	    
+	</lams:Page>
 </html:form>
Fisheye: Tag b47369533cc464d433b2a4306e8cc0bd3f8ecaa1 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b47369533cc464d433b2a4306e8cc0bd3f8ecaa1 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/definelaterheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
diff -u -r26a0240d04a160036cc15d1adca267cd1e9c42e5 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 26a0240d04a160036cc15d1adca267cd1e9c42e5)
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -32,6 +32,7 @@
 	<c:url value="/defineLater.do" var="authoringUrl">
 		<c:param name="contentFolderID" value="${contentFolderID}" />
 		<c:param name="toolContentID" value="${toolContentID}" />
+		<c:param name="mode" value="teacher" />
 	</c:url>
 	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
 		<fmt:message key="label.monitoring.edit.activity.edit" />
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -193,7 +193,7 @@
 
     // for condition management use
 
-    public static final Object ATTR_CONDITION_SET = "conditionList";
+    public static final String ATTR_CONDITION_SET = "conditionList";
     public static final String PARAM_ORDER_ID = "orderId";
     public static final String ATTR_DELETED_CONDITION_LIST = "deletedConditionList";
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -78,7 +78,6 @@
 
 /**
  * @author Steve.Ni
- * @version $Revision$
  */
 public class AuthoringAction extends Action {
     private static final int INIT_INSTRUCTION_COUNT = 2;
@@ -178,7 +177,7 @@
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.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(SurveyConstants.PARAM_ITEM_INDEX), -1);
 	if (itemIdx != -1) {
@@ -240,7 +239,7 @@
     private ActionForward switchItem(ActionMapping mapping, HttpServletRequest request, boolean up) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.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(SurveyConstants.PARAM_ITEM_INDEX), -1);
 	if (itemIdx != -1) {
@@ -282,7 +281,7 @@
 	QuestionForm itemForm = (QuestionForm) form;
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.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(SurveyConstants.PARAM_ITEM_INDEX), -1);
 	SurveyQuestion item = null;
@@ -333,7 +332,7 @@
 	    HttpServletResponse response) {
 	QuestionForm itemForm = (QuestionForm) form;
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.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(SurveyConstants.PARAM_ITEM_INDEX), -1);
 	SortedSet<SurveyQuestion> surveyList = getSurveyItemList(sessionMap);
@@ -425,7 +424,7 @@
 	surveyForm.setContentFolderID(contentFolderID);
 
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	surveyForm.setSessionMapID(sessionMap.getSessionID());
 
@@ -492,7 +491,7 @@
     private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	SurveyForm existForm = (SurveyForm) sessionMap.get(SurveyConstants.ATTR_SURVEY_FORM);
 
 	SurveyForm surveyForm = (SurveyForm) form;
@@ -503,11 +502,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(SurveyConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(SurveyConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+
+	return mapping.findForward(SurveyConstants.SUCCESS);
     }
 
     /**
@@ -525,20 +522,11 @@
 	SurveyForm surveyForm = (SurveyForm) form;
 
 	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(surveyForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(surveyForm.getSessionMapID());
 
 	ToolAccessMode mode = getAccessMode(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
-	ActionMessages errors = validate(surveyForm, mapping, request);
-	if (!errors.isEmpty()) {
-	    saveErrors(request, errors);
-	    if (mode.isAuthor()) {
-		return mapping.findForward("author");
-	    } else {
-		return mapping.findForward("monitor");
-	    }
-	}
-
 	Survey survey = surveyForm.getSurvey();
 	ISurveyService service = getSurveyService();
 
@@ -549,18 +537,18 @@
 	    surveyPO = survey;
 	    surveyPO.setCreated(new Timestamp(new Date().getTime()));
 	    surveyPO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = surveyPO.getUid();
-		PropertyUtils.copyProperties(surveyPO, survey);
-		// get back UID
-		surveyPO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content (definelater)
-		surveyPO.setInstructions(survey.getInstructions());
-		surveyPO.setTitle(survey.getTitle());
-		// change define later status
+	    Long uid = surveyPO.getUid();
+	    PropertyUtils.copyProperties(surveyPO, survey);
+	    // get back UID
+	    surveyPO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
 		surveyPO.setDefineLater(false);
 	    }
+		
 	    surveyPO.setUpdated(new Timestamp(new Date().getTime()));
 	}
 
@@ -637,11 +625,7 @@
 	surveyForm.setSurvey(surveyPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	return mapping.findForward(SurveyConstants.SUCCESS);
     }
 
     // *************************************************************************************
@@ -662,7 +646,7 @@
      * @param request
      * @return
      */
-    private SortedSet<SurveyQuestion> getSurveyItemList(SessionMap sessionMap) {
+    private SortedSet<SurveyQuestion> getSurveyItemList(SessionMap<String, Object> sessionMap) {
 	SortedSet<SurveyQuestion> list = (SortedSet<SurveyQuestion>) sessionMap.get(SurveyConstants.ATTR_QUESTION_LIST);
 	if (list == null) {
 	    list = new TreeSet<SurveyQuestion>(new QuestionsComparator());
@@ -677,7 +661,7 @@
      * @param request
      * @return
      */
-    private SortedSet<SurveyCondition> getSurveyConditionSet(SessionMap sessionMap) {
+    private SortedSet<SurveyCondition> getSurveyConditionSet(SessionMap<String, Object> sessionMap) {
 	SortedSet<SurveyCondition> set = (SortedSet<SurveyCondition>) sessionMap
 		.get(SurveyConstants.ATTR_CONDITION_SET);
 	if (set == null) {
@@ -693,7 +677,7 @@
      * @param request
      * @return
      */
-    private List getDeletedSurveyItemList(SessionMap sessionMap) {
+    private List getDeletedSurveyItemList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, SurveyConstants.ATTR_DELETED_QUESTION_LIST);
     }
 
@@ -704,7 +688,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();
@@ -795,7 +779,7 @@
 	 * 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<SurveyQuestion> surveyList = getSurveyItemList(sessionMap);
 	int itemIdx = NumberUtils.stringToInt(itemForm.getItemIndex(), -1);
@@ -901,24 +885,6 @@
 	return mode;
     }
 
-    private ActionMessages validate(SurveyForm surveyForm, ActionMapping mapping, HttpServletRequest request) {
-	ActionMessages errors = new ActionMessages();
-	// if (StringUtils.isBlank(surveyForm.getSurvey().getTitle())) {
-	// ActionMessage error = new ActionMessage("error.title.empty");
-	// 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;
-    }
-
     /**
      * Ajax call, will add one more input line for new survey item instruction.
      *
@@ -979,7 +945,7 @@
      * @param request
      * @return
      */
-    private List getDeletedSurveyConditionList(SessionMap sessionMap) {
+    private List getDeletedSurveyConditionList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, SurveyConstants.ATTR_DELETED_CONDITION_LIST);
     }
 }
Index: lams_tool_survey/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r14c269dab2fd9de7863a2074fd5ee1561215d066 -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_survey/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 14c269dab2fd9de7863a2074fd5ee1561215d066)
+++ lams_tool_survey/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -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.survey.web.action.AuthoringAction"
 			name="surveyForm" 
 			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>
 		<!-- ==========  Survey Item : URL ========== -->
 		<action path="/authoring/newItemInit"
Index: lams_tool_survey/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1
--- lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
         
-
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%>
 
@@ -17,7 +16,6 @@
 	    		selectTab(tag.value);
             else
                 selectTab(1); //select the default tab;
-          
         }     
         
         function doSelectTab(tabId) {
@@ -35,6 +33,7 @@
 	<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="survey.contentId" />
+		<html:hidden property="mode" value="${mode}"/>
 		<html:hidden property="sessionMapID" />
 		<html:hidden property="contentFolderID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
@@ -69,7 +68,7 @@
 				<!-- Button Row -->
 				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 					toolSignature="<%=SurveyConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.survey.contentId}" 
-					 customiseSessionID="${formBean.sessionMapID}"
+					 customiseSessionID="${formBean.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
 					 contentFolderID="${formBean.contentFolderID}" />
 			</lams:TabBodyArea>
 			
Fisheye: Tag b47369533cc464d433b2a4306e8cc0bd3f8ecaa1 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?