Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v
diff -u -r1.22 -r1.23
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	30 Nov 2005 03:36:13 -0000	1.22
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	14 Dec 2005 03:34:47 -0000	1.23
@@ -1,5 +1,13 @@
 		<!-- ========== Action Mapping Definitions ============================== -->
-		
+		<action path="/defineLater"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="forumForm" 
+			scope="session" 
+			validate="false"
+			parameter="defineLater">
+			<forward name="success" path="tiles:/monitoring/forum/defineLater" />
+		</action>
+   		
 		<!-- ========== BEGIN: Authroing Definitions ============================== -->
 		<action path="/authoring/init"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
@@ -16,7 +24,8 @@
 			scope="session" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="author" path="/jsps/authoring/authoring.jsp" />
+			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
 		</action>
 
 		<action path="/authoring/uploadOnline"
@@ -122,7 +131,8 @@
 			scope="session" 
 			validate="false"
 			parameter="finishTopic" >
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="author" path="/jsps/authoring/authoring.jsp" />
+			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
 		</action>
 		
 		<!-- ========== END: Authroing Definitions ============================== -->
Index: lams_tool_forum/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/tool_insert.sql,v
diff -u -r1.10 -r1.11
--- lams_tool_forum/db/sql/tool_insert.sql	8 Dec 2005 03:04:46 -0000	1.10
+++ lams_tool_forum/db/sql/tool_insert.sql	14 Dec 2005 03:34:47 -0000	1.11
@@ -46,7 +46,7 @@
 'tool/lafrum11/learning/viewForum.do',
 'tool/lafrum11/authoring/init.do',
 'tool/lafrum11/monitoring/listContentUsers.do',
-'tool/lafrum11/definelater.do',
+'tool/lafrum11/defineLater.do',
 'tool/lafrum11/exportPortfolio',
 'tool/lafrum11/contribute.do',
 'tool/lafrum11/moderate.do',
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v
diff -u -r1.18 -r1.19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	2 Dec 2005 04:58:00 -0000	1.18
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	14 Dec 2005 03:34:47 -0000	1.19
@@ -47,7 +47,11 @@
 
 	public static final String MESSAGE_UID = "messageID";
 
+	public static final String MODE = "mode";
+	public static final String AUTHOR_MODE = "author_mode";
+	public static final String MONITOR_MODE = "monitor_mode";
 
+
 	
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/Attic/ApplicationResources.properties,v
diff -u -r1.16 -r1.17
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	14 Dec 2005 03:25:29 -0000	1.16
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	14 Dec 2005 03:35:27 -0000	1.17
@@ -53,6 +53,7 @@
 page.title.monitoring.view.instructions=View Instructions
 page.title.monitoring.view.topic=View topic
 page.title.monitoring.statistic=Statistic
+page.title.monitoring.definelater=Forum Tool Define
 ## errors
 errors.header=<b class="error">
 errors.footer=</b>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.29 -r1.30
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	12 Dec 2005 01:19:42 -0000	1.29
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	14 Dec 2005 03:34:47 -0000	1.30
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
@@ -76,8 +77,13 @@
 		String param = mapping.getParameter();
 		//-----------------------Forum Author function ---------------------------
 	  	if (param.equals("initPage")) {
+	  		request.getSession().setAttribute(ForumConstants.MODE,ForumConstants.AUTHOR_MODE);
        		return initPage(mapping, form, request, response);
         }
+	  	if (param.equals("defineLater")) {
+	  		request.getSession().setAttribute(ForumConstants.MODE,ForumConstants.MONITOR_MODE);
+	  		return initPage(mapping, form, request, response);
+	  	}
         if (param.equals("updateContent")) {
        		return updateContent(mapping, form, request, response);
         }
@@ -218,6 +224,11 @@
 				//new Forum, create it.
 				forumPO = forum;
 				forumPO.setContentId(forumForm.getToolContentID());
+			}else{
+				Long uid = forumPO.getUid();
+				PropertyUtils.copyProperties(forumPO,forum);
+				//get back UID
+				forumPO.setUid(uid);
 			}
 			
 	    	//merge attachment info
@@ -300,7 +311,12 @@
 		} catch (Exception e) {
 			log.error(e);
 		}
-		return mapping.findForward("success");
+		
+    	String mode = (String) request.getSession().getAttribute(ForumConstants.MODE);
+    	if(StringUtils.equals(mode,ForumConstants.AUTHOR_MODE))
+    		return mapping.findForward("author");
+    	else
+    		return mapping.findForward("monitor");
 	}
 
 	/**
@@ -784,7 +800,11 @@
 		}
     	forum.setMessages(msgSet);
     	
-    	return mapping.findForward("success");
+    	String mode = (String) request.getSession().getAttribute(ForumConstants.MODE);
+    	if(StringUtils.equals(mode,ForumConstants.AUTHOR_MODE))
+    		return mapping.findForward("author");
+    	else
+    		return mapping.findForward("monitor");
     	
     }
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.10 -r1.11
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	13 Dec 2005 06:10:41 -0000	1.10
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	14 Dec 2005 03:34:47 -0000	1.11
@@ -110,14 +110,16 @@
 		 if (param.equals("statistic")) {
 			 return statistic(mapping,form, request, response);
 		 }
+
 		 //***************** Miscellaneous ********************		 
 		 if (param.equals("viewTopic")) {
 			 return viewTopic(mapping,form, request, response);
 		 }
 		 return mapping.findForward("error");
 	 }
 
-	 /**
+
+	/**
 	  * The initial method for monitoring. List all users according to given Content ID.
 	  * 
 	  * @param mapping
@@ -565,7 +567,6 @@
 		request.setAttribute("totalMessage",sessionTotalMsgMap);
 		return mapping.findForward("success");
 	}
-
 	/**
 	 * View topic subject, content and attachement.
 	 * 
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.27 -r1.28
--- lams_tool_forum/web/WEB-INF/struts-config.xml	30 Nov 2005 03:36:14 -0000	1.27
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	14 Dec 2005 03:34:48 -0000	1.28
@@ -50,6 +50,14 @@
    <action-mappings>
 
    		<!-- ========== Action Mapping Definitions ============================== -->
+		<action path="/defineLater"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="forumForm" 
+			scope="session" 
+			validate="false"
+			parameter="defineLater">
+			<forward name="success" path="tiles:/monitoring/forum/defineLater" />
+		</action>
 		<!-- ========== BEGIN: Authroing Definitions ============================== -->
 		<action path="/authoring/init"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
@@ -66,7 +74,8 @@
 			scope="session" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="author" path="/jsps/authoring/authoring.jsp" />
+			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
 		</action>
 
 		<action path="/authoring/uploadOnline"
@@ -161,7 +170,8 @@
 			scope="session" 
 			validate="false"
 			parameter="finishTopic" >
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="author" path="/jsps/authoring/authoring.jsp" />
+			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
 		</action>
 		<!-- ========== END: Authroing Definitions ============================== -->
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.17 -r1.18
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	14 Dec 2005 03:25:09 -0000	1.17
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	14 Dec 2005 03:35:27 -0000	1.18
@@ -56,6 +56,11 @@
 	<!-- E: Generic -->
 	
 	<!-- B: Authoring -->
+	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
+    	<put name="body" value="/jsps/monitoring/definelater.jsp"/>
+	</definition>
+	
     <definition name="tiles:/authoring/forum/newTopic" extends="tiles:layout">
     	<put name="pageTitleKey" value="title.message.add"/>
     	<put name="body" value="/jsps/authoring/message/create.jsp"/>
@@ -141,6 +146,7 @@
     	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
     	<put name="body" value="/jsps/monitoring/viewtopic.jsp"/>
 	</definition>
+	
 	<!-- E: Monitoring -->
 	
 </tiles-definitions>
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/authoring.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	14 Dec 2005 03:25:29 -0000	1.9
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	14 Dec 2005 03:35:27 -0000	1.10
@@ -1,15 +1,18 @@
-<%@include file="../sharing/share.jsp" %>
+<%@ include file="/includes/taglibs.jsp" %>
 <%@ taglib uri="tags-fck-editor" prefix="FCK"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
 <head>
 	<html:base />
 	<title>Forum Tool</title>
+	<c:set var="lams"><lams:LAMSURL/></c:set>
+	<c:set var="tool"><lams:WebAppURL/></c:set>
+	
 	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-    <link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
+    <link href="<c:out value="${lams}"/>css/aqua.css" rel="stylesheet" type="text/css">
     <script lang="javascript">
-	    var imgRoot="<%=LAMS_WEB_ROOT%>/images/";
+	    var imgRoot="<c:out value="${lams}"/>images/";
 	    var themeName="aqua";
 	    function setTab(curr){
 	    	var tag = document.getElementById("currentTab");
@@ -20,8 +23,8 @@
 	    	document.forms[0].submit();
 	    }
     </script>
-	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/tabcontroller.js"></script>    
-	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/common.js"></script>
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
 </head>
 <c:if test="${empty currentTab}"><c:set var="currentTab" value="b"/></c:if>
@@ -41,9 +44,9 @@
 	<!-- table for tab 1 (basic)-->
 	<table border="0" cellspacing="0" cellpadding="0">
 	  <tr>
-		<td><a href="#"  onClick="showTab('b');setTab('b');return false;" ><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_s_left.gif" name="tab_left_b" width="8" height="25" border="0" id="tab_left_b"/></a></td>
+		<td><a href="#"  onClick="showTab('b');setTab('b');return false;" ><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_b" width="8" height="25" border="0" id="tab_left_b"/></a></td>
 		<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_b"  onClick="showTab('b');setTab('b');return false;" ><a href="#" onClick="showTab('b');setTab('b');return false;" id="b" >Basic</a></td>
-		<td><a href="#" onClick="showTab('b');setTab('b');return false;"><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_s_right.gif"  name="tab_right_b" width="8" height="25" border="0" id="tab_right_b"/></a></td>
+		<td><a href="#" onClick="showTab('b');setTab('b');return false;"><img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_b" width="8" height="25" border="0" id="tab_right_b"/></a></td>
 	  </tr>
 	</table>
 
@@ -52,9 +55,9 @@
 	<!-- table for tab 2 (advanced) -->
 	<table border="0" cellspacing="0" cellpadding="0">
 	  <tr>
-		<td><a href="#" onClick="showTab('a');setTab('a');return false;"><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_left.gif" name="tab_left_a" width="8" height="22" border="0" id="tab_left_a" /></a></td>
+		<td><a href="#" onClick="showTab('a');setTab('a');return false;"><img src="<c:out value="${lams}"/>images/aqua_tab_left.gif" name="tab_left_a" width="8" height="22" border="0" id="tab_left_a" /></a></td>
 		<td class="tab tabcentre" width="90" id="tab_tbl_centre_a" onClick="showTab('a');setTab('a');return false;"><a href="#" onClick="showTab('a');setTab('a');return false;" id="a" >Advanced</a></td>
-		<td><a href="#" onClick="showTab('a');setTab('a');return false;"><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_right.gif" name="tab_right_a" width="9" height="22" border="0" id="tab_right_a" /></a></td>
+		<td><a href="#" onClick="showTab('a');setTab('a');return false;"><img src="<c:out value="${lams}"/>images/aqua_tab_right.gif" name="tab_right_a" width="9" height="22" border="0" id="tab_right_a" /></a></td>
 	  </tr>
 	</table>
 
@@ -63,9 +66,9 @@
 	<!-- table for ab 3 (instructions) -->
 	<table border="0" cellspacing="0" cellpadding="0">
 	  <tr>
-		<td ><a href="#" onClick="showTab('i');setTab('i');return false;"><img border="0" src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_left.gif" width="8" height="22" id="tab_left_i"   name="tab_left_i" /></a></td>
+		<td ><a href="#" onClick="showTab('i');setTab('i');return false;"><img border="0" src="<c:out value="${lams}"/>images/aqua_tab_left.gif" width="8" height="22" id="tab_left_i"   name="tab_left_i" /></a></td>
 		<td class="tab tabcentre" width="90" id="tab_tbl_centre_i"  onClick="showTab('i');setTab('i');return false;" ><a href="#" onClick="showTab('i');setTab('i');return false;" id="i" >Instructions</a></td>
-		<td ><a href="#" onClick="showTab('i');setTab('i');return false;"><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_right.gif"  width="9" height="22" border="0" id="tab_right_i"  name="tab_right_i"/></a></td>
+		<td ><a href="#" onClick="showTab('i');setTab('i');return false;"><img src="<c:out value="${lams}"/>images/aqua_tab_right.gif"  width="9" height="22" border="0" id="tab_right_i"  name="tab_right_i"/></a></td>
 	  </tr>
 	</table>
 
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/authoring/basic.jsp	14 Dec 2005 03:25:29 -0000	1.8
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	14 Dec 2005 03:35:27 -0000	1.9
@@ -1,3 +1,4 @@
+
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
 
Index: lams_tool_forum/web/jsps/message/topiclist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/message/Attic/topiclist.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/message/topiclist.jsp	8 Nov 2005 06:15:02 -0000	1.6
+++ lams_tool_forum/web/jsps/message/topiclist.jsp	14 Dec 2005 03:34:48 -0000	1.7
@@ -3,7 +3,8 @@
 	function popupable(url,name){
 	if(window.opener != null || (typeof popFobidden != "undefined"))
 		//it is already a popup window, then just load it
-		location.href=url;
+//		location.href=url;
+		launchPopup(url,name);
 	else
 		//it is not in popup window, so pops it up
 		launchPopup(url,name);
Index: lams_tool_forum/web/jsps/monitoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/definelater.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/monitoring/definelater.jsp	14 Dec 2005 03:34:47 -0000	1.1
@@ -0,0 +1,10 @@
+<%@ include file="/includes/taglibs.jsp" %>
+<%@ taglib uri="tags-fck-editor" prefix="FCK"%>
+
+<html:form action="authoring/update" method="post">
+		<c_rt:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<html:hidden property="toolContentID"/>
+		
+		<%@ include file="../authoring/basic.jsp"%>
+		
+</html:form>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/monitoring/usermarklist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/usermarklist.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	24 Nov 2005 06:25:24 -0000	1.3
+++ lams_tool_forum/web/jsps/monitoring/usermarklist.jsp	14 Dec 2005 03:34:47 -0000	1.4
@@ -32,6 +32,33 @@
 					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
 				</td>
 			</tr>
+			 <tr>
+			<tr>
+				<td>Marks:</td>
+				<td colspan="3"> 	
+						<c:choose>
+									<c:when test="${empty topic.message.report.mark}">
+										<c:out value="Not Available"/>
+									</c:when>
+									<c:otherwise>
+										<c:out value="${topic.message.report.mark}" escapeXml="false"/>
+									</c:otherwise>
+								</c:choose>
+				</td>
+			</tr>			
+			<tr>
+				<td>Comments:</td>
+				<td  colspan="3">
+								<c:choose>
+									<c:when test="${empty topic.message.report.comment}">
+										<c:out value="Not Available"/>								
+									</c:when>
+									<c:otherwise>
+										<c:out value="${topic.message.report.comment}" escapeXml="false"/>
+									</c:otherwise>
+								</c:choose>
+				</td>
+			</tr>
 		 <tr>
 			<td colspan="2">
 			<br>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/sharing/share.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?