Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.25 -r1.26
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	8 Mar 2006 23:38:52 -0000	1.25
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	16 Mar 2006 03:21:06 -0000	1.26
@@ -472,13 +472,15 @@
 		Forum forum = toolSession.getForum();
 		ForumUser currentUser = getCurrentUser(request);
 		ForumUser forumCreatedBy = forum.getCreatedBy();
-
-		if (currentUser.getUserId().equals(forumCreatedBy.getUserId())) {
+	
+		// TODO Skipping permissions for now, currently having issues with default learning designs not having an create_by field
+		// we should be looking at whether a user is a teacher and more specifically staff
+//		if (currentUser.getUserId().equals(forumCreatedBy.getUserId())) {
 			forumService.updateMessageHideFlag(msgId, hideFlag.booleanValue());
-		} else {
-			log.info(currentUser + "does not have permission to hide/show postings in forum: " + forum.getUid());
-			log.info("Forum created by :" + forumCreatedBy.getUid() + ", Current User is: " + currentUser.getUid());
-		}
+//		} else {
+//			log.info(currentUser + "does not have permission to hide/show postings in forum: " + forum.getUid());
+//			log.info("Forum created by :" + forumCreatedBy.getUid() + ", Current User is: " + currentUser.getUid());
+//		}
 
 		
 		// echo back this topic thread into page
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.13 -r1.14
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	8 Mar 2006 23:42:03 -0000	1.13
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	16 Mar 2006 03:21:06 -0000	1.14
@@ -76,8 +76,8 @@
 			throws Exception {
 		String param = mapping.getParameter();
 
-		if (param.equals("listContentUsers")) {
-			return listContentUsers(mapping, form, request, response);
+		if (param.equals("init")) {
+			return init(mapping, form, request, response);
 		}
 		// ***************** Marks Functions ********************
 		if (param.equals("viewAllMarks")) {
@@ -96,34 +96,49 @@
 			return updateMark(mapping, form, request, response);
 		}
 
-		// ***************** Activity and Instructions ********************
-		if (param.equals("viewActivity")) {
-			return viewActivity(mapping, form, request, response);
-		}
-		if (param.equals("editActivity")) {
-			return editActivity(mapping, form, request, response);
-		}
-		if (param.equals("updateActivity")) {
-			return updateActivity(mapping, form, request, response);
-		}
-		if (param.equals("viewInstructions")) {
-			return viewInstructions(mapping, form, request, response);
-		}
-		// ***************** Statistic ********************
-		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");
 	}
-
+	
+    /**
+     * Default ActionForward for Monitor
+     *  (non-Javadoc)
+     * @see org.apache.struts.actions.DispatchAction#unspecified(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+	
 	/**
+	 * The initial method for monitoring
+	 */
+	private ActionForward init(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		// read in parameters and set session attributes.
+		Long toolContentID = new Long(WebUtil.readLongParam(request,
+				AttributeNames.PARAM_TOOL_CONTENT_ID));
+		request.getSession().setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,
+				toolContentID);
+		request.getSession().setAttribute(AttributeNames.PARAM_MODE,
+				ToolAccessMode.TEACHER);
+		
+		// perform the actions for all the tabs.
+		doTabs(mapping, form, request, response);
+		
+		return mapping.findForward("load");
+	}
+	
+	private ActionForward doTabs(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+   	 	this.listContentUsers(mapping, form, request, response);
+   	 	this.viewInstructions(mapping, form, request, response);
+   	 	this.viewActivity(mapping, form, request, response);
+   	 	this.statistic(mapping, form, request, response);
+      	return mapping.findForward("load");
+	}
+	
+	/**
 	 * The initial method for monitoring. List all users according to given
-	 * Content ID. 
+	 * Content ID.
 	 * 
 	 * @param mapping
 	 * @param form
@@ -134,14 +149,7 @@
 	private ActionForward listContentUsers(ActionMapping mapping,
 			ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		Long toolContentID = new Long(WebUtil.readLongParam(request,
-				AttributeNames.PARAM_TOOL_CONTENT_ID));
-		request.getSession().setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,
-				toolContentID);
-		
-		request.getSession().setAttribute(AttributeNames.PARAM_MODE, ToolAccessMode.TEACHER);					
-		
-		return userList(mapping, request);		
+		return userList(mapping, request);
 	}
 
 	/**
@@ -164,7 +172,7 @@
 		Map topicsByUser = getTopicsSortedByAuthor(topicList);
 		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 		request.setAttribute("report", topicsByUser);
-	
+
 		return mapping.findForward("success");
 	}
 
@@ -302,7 +310,7 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward viewUserMark(ActionMapping mapping, ActionForm form,
+	public ActionForward viewUserMark(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 		Long userUid = new Long(WebUtil.readLongParam(request,
 				ForumConstants.USER_UID));
@@ -429,7 +437,9 @@
 		}
 		String title = forum.getTitle();
 		String instruction = forum.getInstructions();
-
+			
+		boolean isForumEditable = ForumWebUtils.isForumEditable(forum);
+		request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable));
 		request.setAttribute("title", title);
 		request.setAttribute("instruction", instruction);
 		return mapping.findForward("success");
@@ -508,8 +518,9 @@
 					"error.fail.get.forum"));
 		}
 		if (StringUtils.isEmpty(title)) {
-			errors.add("activity.title", new ActionMessage(
-					"error.title.empty"));
+			errors
+					.add("activity.title", new ActionMessage(
+							"error.title.empty"));
 		}
 		// echo back to screen
 		request.setAttribute("title", title);
Index: lams_tool_forum/web/includes/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/Attic/header.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/web/includes/header.jsp	5 Mar 2006 22:58:24 -0000	1.9
+++ lams_tool_forum/web/includes/header.jsp	16 Mar 2006 03:23:10 -0000	1.10
@@ -1,17 +1,55 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
 <head>
-<title><bean:message key="appName" /></title>
+	<title>
+		<bean:message key="appName" />
+	</title>
+	<lams:css />
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${tool}includes/javascript/tabcontroller.js"></script>
+	<script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
+	<script type="text/javascript">
+     //<![CDATA[
+	var imgRoot="${lams}images/";
+	var themeName="aqua";
+        
+	function init(){
+		initTabSize(4);
+            
+//		var tag = document.getElementById("currentTab");
+//		if(tag.value != "")
+//			selectTab(tag.value);
+//      else
+			selectTab(1);
+	}  
+        
+	function doSelectTab(tabId) {
+		var tag = document.getElementById("currentTab");
+		tag.value = tabId;
+		selectTab(tabId);
+	}
 
-<link href="<c:out value="${lams}"/>css/aqua.css" rel="stylesheet" type="text/css">
-<script src='<c:out value="${lams}"/>includes/javascript/common.js'></script>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<script lang="javascript">
-<html:javascript dynamicJavascript="false" staticJavascript="true"/>
-</script>
+	function doSubmit(method, tabId) {
+//		if(tabId != null)
+//			document.forumMonitoringForm.currentTab.value=tabId;
+//		document.forumMonitoringForm.method.value=method;
+		document.forumMonitoringForm.submit();
+	}
+	//]]>        
+	</script>
 
+	<script type="text/javascript">
+	//<![CDATA[
+		<html:javascript dynamicJavascript="false" staticJavascript="true"/>
+	//]]>		
+	</script>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/layout.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/web/includes/layout.jsp	5 Mar 2006 22:58:16 -0000	1.7
+++ lams_tool_forum/web/includes/layout.jsp	16 Mar 2006 03:23:10 -0000	1.8
@@ -1,21 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+	"http://www.w3.org/TR/html4/loose.dtd">
+
 <%@ include file="/includes/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
+
 <html>
+	<tiles:insert attribute="header" />
+	<body>
+		<tiles:useAttribute name="pageTitleKey" scope="request" />
+		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+		<logic:notEmpty name="pTitleKey">
+			<h1>
+				<bean:message key="<%=pTitleKey %>" />
+			</h1>
+		</logic:notEmpty>
 
-<tiles:insert attribute="header" />
-<body >
-
-	<tiles:useAttribute name="pageTitleKey" scope="request" />
-	<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-	<logic:notEmpty name="pTitleKey">
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><b class="subTitle"><bean:message key="<%=pTitleKey %>" /></b></td>
-			</tr>
-		</table>
-	</logic:notEmpty>
-
-	<tiles:insert attribute="body" />
-	<tiles:insert attribute="footer" />
-</body>
+		<tiles:insert attribute="body" />
+		<tiles:insert attribute="footer" />
+	</body>
 </html>
Index: lams_tool_forum/web/includes/tablayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/tablayout.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/web/includes/tablayout.jsp	8 Mar 2006 23:53:58 -0000	1.2
+++ lams_tool_forum/web/includes/tablayout.jsp	16 Mar 2006 03:23:10 -0000	1.3
@@ -1,23 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+	"http://www.w3.org/TR/html4/loose.dtd">
+
 <%@ include file="/includes/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
 <html>
 	<tiles:insert attribute="header" />
-	<body>
-		<tiles:insert attribute="tab" />
-
+	<body onLoad="init()">
 		<tiles:useAttribute name="pageTitleKey" scope="request" />
 		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
 		<logic:notEmpty name="pTitleKey">
-			<table border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td>
-						<b class="subTitle">
-							<bean:message key="<%=pTitleKey %>" />
-						</b>
-					</td>
-				</tr>
-			</table>
+			<h1>
+				<bean:message key="<%=pTitleKey %>" />
+			</h1>
 		</logic:notEmpty>
 
 		<tiles:insert attribute="body" />
Index: lams_tool_forum/web/includes/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/Attic/taglibs.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/web/includes/taglibs.jsp	5 Mar 2006 22:58:24 -0000	1.9
+++ lams_tool_forum/web/includes/taglibs.jsp	16 Mar 2006 03:23:10 -0000	1.10
@@ -6,5 +6,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-fck-editor" prefix="FCK"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
 
Index: lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/contentuserlist.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp	8 Mar 2006 23:46:57 -0000	1.8
+++ lams_tool_forum/web/jsps/monitoring/contentuserlist.jsp	16 Mar 2006 03:23:54 -0000	1.9
@@ -1,36 +1,26 @@
 <%@ include file="/includes/taglibs.jsp"%>
-
 <html:errors />
-<html:xhtml />
 
-<div id="datatablecontainer">
+<div class="datatablecontainer">
 	<c:forEach var="element" items="${sessionUserMap}">
 		<c:set var="toolSessionDto" value="${element.key}" />
 		<c:set var="userlist" value="${element.value}" />
 		<c:set var="toolAccessMode" value="${mode}" />
 
-		<!--  need to find cleaner way to contruct url -->
-		<c:url value="/learning/viewForum.do" var="viewForumUrl">
-			<c:param name="mode" value="${toolAccessMode}" />
-			<c:param name="toolSessionID" value="${toolSessionDto.sessionID}" />
-		</c:url>
-
-		<html:link href="${viewForumUrl}" styleClass="button" target="_blank">
-			<fmt:message key="label.monitoring.summary.view.forum" />
-		</html:link>
-
 		<br />
 
 		<table class="forms">
 			<tr>
-				<td style="border-bottom:1px #000 solid;" colspan="4">
+				<th style="border-bottom:1px #000 solid;" colspan="3">
 					<b>
 						<fmt:message key="message.session.name" />
 						:
 					</b>
 					<c:out value="${toolSessionDto.sessionName}" />
-				</td>
+				</th>
+
 			</tr>
+
 			<c:forEach var="user" items="${userlist}">
 				<tr>
 
@@ -42,28 +32,53 @@
 						<c:out value="${user.loginName}" />
 					</td>
 					<td class="formcontrol">
-						<html:form action="/monitoring/viewUserMark">
+						<html:form action="/monitoring/viewUserMark" target="_blank">
 							<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
 							<html:hidden property="userID" value="${user.uid}" />
 							<html:submit property="Mark">
 								<fmt:message key="lable.topic.title.mark" />
 							</html:submit>
 						</html:form>
 					</td>
-
 				</tr>
 			</c:forEach>
+
 			<c:if test="${empty userlist}">
 				<tr>
-					<td colspan="3">
+					<td>
 						<fmt:message key="message.monitoring.summary.no.users" />
 					</td>
 				</tr>
 			</c:if>
 
 			<tr>
+				<td colspan="3">
+					&nbsp;
+				</td>
+
+			</tr>
+
+			<tr>
+
 				<td class="formcontrol">
-					<html:form action="/monitoring/viewAllMarks">
+
+					<c:url value="/learning/viewForum.do" var="url">
+						<c:param name="mode" value="${toolAccessMode}" />
+						<c:param name="toolSessionID" value="${toolSessionDto.sessionID}" />
+					</c:url>
+					
+					<c:set var="viewForumUrl">
+						<html:rewrite href="${url}" />
+					</c:set>
+					
+					<html:link href="${viewForumUrl}" target="_blank">
+						<fmt:message key="label.monitoring.summary.view.forum" />
+					</html:link>
+
+				</td>
+
+				<td class="formcontrol">
+					<html:form action="/monitoring/viewAllMarks" target="_blank">
 						<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
 						<html:submit property="Mark">
 							<fmt:message key="lable.topic.title.mark" />
@@ -78,10 +93,12 @@
 						</html:submit>
 					</html:form>
 				</td>
+
+
 			</tr>
 		</table>
+
 		<br />
-		<br />
 	</c:forEach>
 	<c:if test="${empty sessionUserMap}">
 		<fmt:message key="message.monitoring.summary.no.session" />
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 -r1.1 -r1.2
--- lams_tool_forum/web/jsps/monitoring/definelater.jsp	14 Dec 2005 03:34:47 -0000	1.1
+++ lams_tool_forum/web/jsps/monitoring/definelater.jsp	16 Mar 2006 03:23:54 -0000	1.2
@@ -1,5 +1,4 @@
 <%@ 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) %>" />
Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/editactivity.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/monitoring/editactivity.jsp	6 Mar 2006 03:34:56 -0000	1.8
+++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp	16 Mar 2006 03:23:54 -0000	1.9
@@ -1,40 +1,45 @@
 <%@ include file="/includes/taglibs.jsp"%>
+<html:errors />
 
-<table>
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.basic.title" />
-			:
-		</td>
-		<td>
-			<c:out value="${title}" escapeXml="false" />
-		</td>
-	</tr>
+<div class="datatablecontainer">
+	<table class="forms">
+		<tr>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.basic.title" />
+				:
+			</td>
+			<td class="formcontrol">
+				<c:out value="${title}" escapeXml="false" />
+			</td>
+		</tr>
 
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.basic.instruction" />
-			:
-		</td>
-		<td>
-			<c:out value="${instruction}" escapeXml="false" />
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<c:set var="isPageEditable" value="${isPageEditable}" />
-			<c:choose>
-				<c:when test='${isPageEditable == "true"}'>
-					<html:link forward="forwardToAuthorPage" name="monitorForm" property="parametersToAppend" styleClass="button" target="_blank">
-						<fmt:message key="label.monitoring.edit.activity.edit" />
-					</html:link>
-					
-					
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="message.monitoring.edit.activity.not.editable" />
-				</c:otherwise>
-			</c:choose>
-		</td>
-	</tr>
-</table>
+		<tr>
+			<td class="formlabel"> 
+				<fmt:message key="label.authoring.basic.instruction" />
+				:
+			</td>
+			<td class="formcontrol">
+				<c:out value="${instruction}" escapeXml="false" />
+			</td>
+		</tr>
+		
+		<tr>
+			<td class="formcontrol" colspan="2">
+				<c:set var="isPageEditable" value="${isPageEditable}" />
+				<c:choose>
+					<c:when test='${isPageEditable == "true"}'>
+						<c:url value="/authoring/init.do" var="authoringUrl">
+							<c:param name="toolContentID" value="${toolContentID}" />
+						</c:url>
+						<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+							<fmt:message key="label.monitoring.edit.activity.edit" />
+						</html:link>
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.monitoring.edit.activity.not.editable" />
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
+	</table>
+</div>
Index: lams_tool_forum/web/jsps/monitoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/instructions.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/jsps/monitoring/instructions.jsp	16 Jan 2006 00:00:49 -0000	1.5
+++ lams_tool_forum/web/jsps/monitoring/instructions.jsp	16 Mar 2006 03:23:54 -0000	1.6
@@ -1,91 +1,102 @@
-<%@ include file="/includes/taglibs.jsp" %>
+<%@ include file="/includes/taglibs.jsp"%>
+<html:errors />
 
+<div class="datatablecontainer">
 	<table class="forms">
-		<!--hidden field contentID passed by flash-->
-		<tr>
-		</tr>
+		<c:set var="formBean" value="${requestScope.forumBean}" />
 		<!-- Instructions Row -->
 		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.online.instruction" />:</td>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.online.instruction" />
+				:
+			</td>
 			<td class="formcontrol">
-				<c:out value="${formBean.forum.onlineInstructions}" escapeXml="false"/>
+				<c:out value="${formBean.forum.onlineInstructions}" escapeXml="false" />
 			</td>
 		</tr>
 		<tr>
-			<td></td>
+			<td>
+				&nbsp;
+			</td>
 			<td class="formcontrol">
-				
+
 				<div id="onlinefile">
-				<c:forEach var="file" items="${formBean.onlineFileList}">
-					<li><c:out value="${file.fileName}"/>
-					<c:set var="viewURL">
-						<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false"/>
-					</c:set>
-					<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-						<fmt:message key="label.view"/>
-					</a>&nbsp;
-					<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
-					</c:set>
-					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-						<fmt:message key="label.download"/>
-					</a>&nbsp;
-					<c:set var="deleteonline">
-					<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}"/>
-					</c:set>
-					<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
-						<fmt:message key="label.authoring.online.delete"/>
-					</html:link>					
-					</li>
-				</c:forEach>
+					<c:forEach var="file" items="${formBean.onlineFileList}">
+						<li>
+							<c:out value="${file.fileName}" />
+							<c:set var="viewURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
+							</c:set>
+							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+								<fmt:message key="label.view" />
+							</a>
+							&nbsp;
+							<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+							</c:set>
+							<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+								<fmt:message key="label.download" />
+							</a>
+							&nbsp;
+							<c:set var="deleteonline">
+								<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
+							</c:set>
+							<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
+								<fmt:message key="label.authoring.online.delete" />
+							</html:link>
+						</li>
+					</c:forEach>
 				</div>
 			</td>
 		</tr>
-		<!------------Offline Instructions ----------------------->
+
+
 		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.offline.instruction" />:</td>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.offline.instruction" />
+				:
+			</td>
 			<td class="formcontrol">
-				<c:out value="${formBean.forum.offlineInstructions}" escapeXml="false"/>
+				<c:out value="${formBean.forum.offlineInstructions}" escapeXml="false" />
 			</td>
 		</tr>
 		<tr>
-			<td></td>
+			<td>
+				&nbsp;
+			</td>
 			<td class="formcontrol">
 				<div id="offlinefile">
-				<c:forEach var="file" items="${formBean.offlineFileList}">
-					<li><c:out value="${file.fileName}"/>
-   				    <c:set var="viewURL">
-						<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false"/>
-					</c:set>
-					<html:link href="javascript:launchInstructionsPopup('${viewURL}')">
-						<fmt:message key="label.view"/>
-					</html:link>
-					<c:set var="downloadURL">
-							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
-					</c:set>
-					<html:link href="${downloadURL}">
-						<fmt:message key="label.download"/>
-					</html:link>
-					<c:set var="deleteoffline">
-					<html:rewrite page="/authoring/deleteOffline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}"/>
-					</c:set>
-					<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
-						<fmt:message key="label.authoring.offline.delete"/>
-					</html:link>					
-					</li>
-				</c:forEach>
+					<c:forEach var="file" items="${formBean.offlineFileList}">
+						<li>
+							<c:out value="${file.fileName}" />
+							<c:set var="viewURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
+							</c:set>
+							<html:link href="javascript:launchInstructionsPopup('${viewURL}')">
+								<fmt:message key="label.view" />
+							</html:link>
+							<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+							</c:set>
+							<html:link href="${downloadURL}">
+								<fmt:message key="label.download" />
+							</html:link>
+							<c:set var="deleteoffline">
+								<html:rewrite page="/authoring/deleteOffline.do?toolContentID=${formBean.toolContentID}&uuID=${file.fileUuid}&versionID=${file.fileVersionId}" />
+							</c:set>
+							<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
+								<fmt:message key="label.authoring.offline.delete" />
+							</html:link>
+						</li>
+					</c:forEach>
 				</div>
 			</td>
 		</tr>
 		<tr>
-			 <td class="formlabel" colspan="2">
-				  	<html:errors property="instruction.globel"/>
-			  </td>
-		</tr>					
-		</tr>
-
+			<td class="formlabel" colspan="2">
+				<html:errors property="instruction.globel" />
+			</td>
 	</table>
-	
-	
\ No newline at end of file
+</div>
+
+
Index: lams_tool_forum/web/jsps/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/monitoring.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/monitoring/monitoring.jsp	16 Mar 2006 03:23:54 -0000	1.1
@@ -0,0 +1,16 @@
+<%@ include file="/includes/taglibs.jsp"%>
+
+<lams:Tabs>
+	<lams:Tab id="1" key="monitoring.tab.summary" />
+	<lams:Tab id="2" key="monitoring.tab.instructions" />
+	<lams:Tab id="3" key="monitoring.tab.edit.activity" />
+	<lams:Tab id="4" key="monitoring.tab.statistics" />
+</lams:Tabs>
+
+
+<div class="tabbody">
+	<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="contentuserlist.jsp" />
+	<lams:TabBody id="2" titleKey="monitoring.tab.instructions" page="instructions.jsp"/>
+	<lams:TabBody id="3" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />
+	<lams:TabBody id="4" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
+</div>
Index: lams_tool_forum/web/jsps/monitoring/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/statistic.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/jsps/monitoring/statistic.jsp	6 Mar 2006 05:23:14 -0000	1.5
+++ lams_tool_forum/web/jsps/monitoring/statistic.jsp	16 Mar 2006 03:23:54 -0000	1.6
@@ -1,65 +1,82 @@
-<%@ include file="/includes/taglibs.jsp" %>
-<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+<%@ include file="/includes/taglibs.jsp"%>
+<html:errors />
 
+<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
 <div class="datatablecontainer">
-<c:forEach var="element" items="${topicList}">
-	<c:set var="toolSessionDto" value="${element.key}"/>
-	<c:set var="sessionTopicList" value="${element.value}"/>
-	<c:forEach var="totalMsg" items="${totalMessage}">
-		<c:if test="${totalMsg.key eq toolSessionDto.sessionID}">
-			<c:set var="sessionTotalMessage" value="${totalMsg.value}"/>
-		</c:if>
+	<c:forEach var="element" items="${topicList}">
+		<c:set var="toolSessionDto" value="${element.key}" />
+		<c:set var="sessionTopicList" value="${element.value}" />
+		<c:forEach var="totalMsg" items="${totalMessage}">
+			<c:if test="${totalMsg.key eq toolSessionDto.sessionID}">
+				<c:set var="sessionTotalMessage" value="${totalMsg.value}" />
+			</c:if>
+		</c:forEach>
+		<c:forEach var="avaMark" items="${markAverage}">
+			<c:if test="${avaMark.key eq toolSessionDto.sessionID}">
+				<c:set var="sessionMarkAverage" value="${avaMark.value}" />
+			</c:if>
+		</c:forEach>
+
+		<fmt:message key="message.session.name" />: <c:out value="${toolSessionDto.sessionName}" />
+
+		<table width="100%" border="0" cellspacing="0" cellpadding="0">
+
+			<tr>
+				<td colspan="2">
+					<div id="datatablecontainer">
+						<table width="100%" align="CENTER" class="form">
+							<tr>
+								<th scope="col" width="50%">
+									<fmt:message key="lable.topic.title.subject" />
+								</th>
+								<th scope="col" width="25%">
+									<fmt:message key="lable.topic.title.message.number" />
+								</th>
+								<th scope="col" width="25%">
+									<fmt:message key="lable.topic.title.average.mark" />
+								</th>
+							</tr>
+							<c:forEach items="${sessionTopicList}" var="topic">
+								<tr>
+									<td valign="MIDDLE" width="48%">
+										<c:set var="viewtopic">
+											<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&amp;create=${topic.message.created.time}" />
+										</c:set>
+										<html:link href="javascript:launchPopup('${viewtopic}');">
+											<c:out value="${topic.message.subject}" />
+										</html:link>
+									</td>
+									<td>
+										<c:out value="${topic.message.replyNumber+1}" />
+									</td>
+									<td>
+										<c:out value="${topic.mark}" />
+									</td>
+								</tr>
+							</c:forEach>
+						</table>
+					</div>
+				</td>
+			</tr>
+
+			<tr>
+				<td>
+					<br>
+					<fmt:message key="lable.monitoring.statistic.total.message" />
+				</td>
+				<td>
+					<br>
+					<c:out value="${sessionTotalMessage}" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="label.monitoring.statistic.average.mark" />
+				</td>
+				<td>
+					<c:out value="${sessionMarkAverage}" />
+				</td>
+			</tr>
+		</table>
 	</c:forEach>
-	<c:forEach var="avaMark" items="${markAverage}">
-		<c:if test="${avaMark.key eq toolSessionDto.sessionID}">
-			<c:set var="sessionMarkAverage" value="${avaMark.value}"/>
-		</c:if>
-	</c:forEach>
-	
-		<fmt:message key="message.session.name"/>: <c:out value="${toolSessionDto.sessionName}"/>
-	
-	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-	
-	  <tr>
-		  <td colspan="2">
-			<div id="datatablecontainer">
-			<table width="100%" align="CENTER" 	class="form">
-				<tr>
-					<th scope="col" width="50%"><fmt:message key="lable.topic.title.subject"/></th>
-					<th scope="col" width="25%"><fmt:message key="lable.topic.title.message.number"/></th>
-					<th scope="col" width="25%"><fmt:message key="lable.topic.title.average.mark"/></th>
-				</tr>
-				<c:forEach items="${sessionTopicList}" var="topic" >
-					<tr>
-						<td valign="MIDDLE" width="48%">
-							<c:set var="viewtopic">
-								<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&create=${topic.message.created.time}" />
-							</c:set> 
-							<html:link href="javascript:launchPopup('${viewtopic}');">
-								<c:out value="${topic.message.subject}" />
-							</html:link>
-						</td>
-						<td>
-							<c:out value="${topic.message.replyNumber+1}"/>
-						</td>
-						<td>
-							<c:out value="${topic.mark}"/>
-						</td>
-					</tr>
-				</c:forEach>
-			</table>
-			</div>  
-		  </td>
-	  </tr>
-	
-	  <tr>
-	    <td><br><fmt:message key="lable.monitoring.statistic.total.message"/></td>
-	    <td><br><c:out value="${sessionTotalMessage}"/></td>
-	  </tr>  
-	  <tr>
-	    <td><fmt:message key="label.monitoring.statistic.average.mark"/></td>
-	    <td><c:out value="${sessionMarkAverage}"/></td>
-	  </tr>
-	</table>
-</c:forEach>
-</div>						
+</div>
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	6 Mar 2006 05:23:14 -0000	1.6
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	16 Mar 2006 03:23:54 -0000	1.7
@@ -2,7 +2,7 @@
 <script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
 
 <html:form action="/monitoring/updateMark"  method="post">	
-<c_rt:set var="formBean" value="<%= session.getAttribute("markForm") %>" />
+<c:set var="formBean" value="<%= session.getAttribute("markForm") %>" />
   <b><fmt:message key="message.assign.mark"/>
   		 <c:out value="${formBean.user.loginName}" /> , <c:out value="${formBean.user.firstName}" />  <c:out value="${formBean.user.lastName}" /> 	
   </b></p>
Index: lams_tool_forum/web/jsps/monitoring/viewactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewactivity.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/jsps/monitoring/viewactivity.jsp	6 Mar 2006 03:39:13 -0000	1.5
+++ lams_tool_forum/web/jsps/monitoring/viewactivity.jsp	16 Mar 2006 03:23:54 -0000	1.6
@@ -1,37 +1,38 @@
 <%@ include file="/includes/taglibs.jsp"%>
-	<div id="basic">
-		<table class="forms">
-			<!-- Title Row -->
-			<tr>
-				<td class="formlabel">
-					<fmt:message key="label.authoring.basic.title" />
-					:
-				</td>
-				<td class="formcontrol">
-					<c:out value="${title}" escapeXml="false" />
-				</td>
-			</tr>
-			<!-- Instructions Row -->
-			<tr>
-				<td class="formlabel">
-					<fmt:message key="label.authoring.basic.instruction" />
-					:
-				</td>
-				<td class="formcontrol">
-					<c:out value="${instruction}" escapeXml="false" />
-				</td>
-			</tr>
-			<tr>
-				<td class="formlabel" colspan="2">
-					<html:errors property="activity.globel" />
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2">
-					<html:link forward="forwardToAuthorPage" styleClass="button">
-						<fmt:message key="label.monitoring.edit.activity.edit" />
-					</html:link>
-				</td>
-			</tr>
-		</table>
-	</div>
\ No newline at end of file
+<html:errors />
+
+<div class="datatablecontainer">
+	<table class="forms">
+		<!-- Title Row -->
+		<tr>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.basic.title" />
+				:
+			</td>
+			<td class="formcontrol">
+				<c:out value="${title}" escapeXml="false" />
+			</td>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td class="formlabel">
+				<fmt:message key="label.authoring.basic.instruction" />
+				:
+			</td>
+			<td class="formcontrol">
+				<c:out value="${instruction}" escapeXml="false" />
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<html:link forward="forwardToAuthorPage" styleClass="button">
+					<fmt:message key="label.monitoring.edit.activity.edit" />
+				</html:link>
+			</td>
+			<td>
+				&nbsp;
+			</td>
+		</tr>
+	</table>
+</div>