Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java,v
diff -u -r1.10 -r1.11
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	1 Aug 2006 07:10:12 -0000	1.10
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	23 Aug 2006 05:42:37 -0000	1.11
@@ -50,7 +50,7 @@
 	private Date dateMarksReleased;
 	private boolean finished;
 	private String comments;	
-	private Long marks;
+	private String marks;
 	private Long uuID;
 	private Long versionID;
 	private String exportedURL;  // the location of this file saved by the export function.      	
@@ -80,7 +80,7 @@
 			this.reportID = report.getReportID();
 			this.dateMarksReleased = report.getDateMarksReleased();		
 			this.comments = report.getComments();
-			this.marks = report.getMarks();
+			this.marks = report.getMarks() != null? report.getMarks().toString():"";
 		}
 		this.userDTO = userDTO;
 	}
@@ -155,13 +155,13 @@
 	/**
 	 * @return Returns the marks.
 	 */
-	public Long getMarks() {
+	public String getMarks() {
 		return marks;
 	}
 	/**
 	 * @param marks The marks to set.
 	 */
-	public void setMarks(Long marks) {
+	public void setMarks(String marks) {
 		this.marks = marks;
 	}	
 	
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v
diff -u -r1.32 -r1.33
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	22 Aug 2006 06:48:38 -0000	1.32
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	23 Aug 2006 05:42:37 -0000	1.33
@@ -332,7 +332,15 @@
 		Long detailID = new Long(WebUtil.readLongParam(request,"detailID"));
 		String updateMode = request.getParameter("updateMode");
 		
-		setMarkPage(request, sessionID, userID, detailID, updateMode);
+		submitFilesService = getSubmitFilesService();
+		
+		List report = new ArrayList<FileDetailsDTO>();
+		report.add(submitFilesService.getFileDetails(detailID));
+		
+		request.setAttribute("report",report);
+		request.setAttribute("updateMode", updateMode);
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
+		
 		return mapping.findForward("updateMark");
 	}
 
@@ -356,25 +364,31 @@
 		String updateMode = request.getParameter("updateMode");
 		Long reportID= new Long(WebUtil.readLongParam(request,"reportID"));
 		
+		ActionMessages errors = new ActionMessages();  
 		//check whether the mark is validate
+		String markStr = request.getParameter("marks");
 		Long marks = null;
-		ActionMessages errors = new ActionMessages();  
 		try {
-			marks = new Long(WebUtil.readLongParam(request,"marks"));
-		} catch (IllegalArgumentException e) {
+			marks = Long.parseLong(markStr);
+		} catch (Exception e) {
 			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.mark.invalid.number"));
 		}
-		//if marks is invalid long, then throw error message directly.
+		
 		String comments = WebUtil.readStrParam(request,"comments",true);
 		if(!errors.isEmpty()){
-			setMarkPage(request, sessionID, userID, detailID, updateMode);
-			//to echo back to error page.
-			List<FileDetailsDTO> list = (List<FileDetailsDTO>) request.getAttribute("report");
-			if(list != null){
-				FileDetailsDTO details = list.get(0);
-				if(details != null)
-					details.setComments(comments);
-			}
+			submitFilesService = getSubmitFilesService();
+			List report = new ArrayList<FileDetailsDTO>();
+			FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID);
+			//echo back the input, even they are wrong.
+			fileDetail.setComments(comments);
+			fileDetail.setMarks(markStr);
+			report.add(fileDetail);
+			
+			request.setAttribute("report",report);
+			request.setAttribute("updateMode", updateMode);
+			request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
+			
+			
 			saveErrors(request,errors);
 			return mapping.findForward("updateMark");
 		}
@@ -445,13 +459,7 @@
 	 * @param updateMode
 	 */
 	private void setMarkPage(HttpServletRequest request, Long sessionID, Long userID, Long detailID, String updateMode) {
-		submitFilesService = getSubmitFilesService();
-		
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-		List report = new ArrayList<FileDetailsDTO>();
-		report.add(submitFilesService.getFileDetails(detailID));
-		request.setAttribute("report",report);
-		request.setAttribute("updateMode", updateMode);
+
 	}
 	/**
 	 * Save statistic information into request
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v
diff -u -r1.32 -r1.33
--- lams_tool_sbmt/web/authoring/authoring.jsp	17 Aug 2006 02:16:05 -0000	1.32
+++ lams_tool_sbmt/web/authoring/authoring.jsp	23 Aug 2006 05:42:37 -0000	1.33
@@ -12,9 +12,11 @@
 <%@ page import="org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants"%>
 <html:html>
 <head>
-	<lams:headItems />
 	
+	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
+	<!-- ********************  CSS ********************** -->
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">	
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
 	
Index: lams_tool_sbmt/web/includes/css/tool_custom.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/includes/css/Attic/tool_custom.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/includes/css/tool_custom.css	23 Aug 2006 05:44:59 -0000	1.1
@@ -0,0 +1,29 @@
+div.error, div.message {
+    background-color: #ffffcc;
+    border: 1px solid #000;
+    color: #000000;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: normal;
+    margin: 10px auto;
+    padding: 3px;
+    text-align: left;
+    vertical-align: bottom;
+}
+
+/* use a different color for the errors */
+div.error {
+	border: 2px solid red;
+}
+b.error {
+    background-color: #ffffcc;
+	border: 2px solid red;
+}
+img.validationWarning, div.errors img.icon, div.messages img.icon {
+    border: 0;
+    width: 14px;
+    height: 13px;
+    vertical-align: top;
+}
+div.message img.icon {
+    vertical-align: middle;
+}
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/includes/javascript/xmlrequest.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/sbmtLearner.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_sbmt/web/learner/sbmtLearner.jsp	17 Aug 2006 02:16:09 -0000	1.15
+++ lams_tool_sbmt/web/learner/sbmtLearner.jsp	23 Aug 2006 05:42:38 -0000	1.16
@@ -39,12 +39,12 @@
 		</div>
 
 		<div id="content-learner">
-			<table cellpadding="0">
+			<table cellpadding="0" cellspacing="0" cellpadding="0">
 				<tr>
 					<td colspan="2">
-						<p>
+						<h2>
 							<c:out value="${learner.contentInstruction}" escapeXml="false" />
-						</p>
+						</h2xs>
 					</td>
 				</tr>
 
@@ -125,6 +125,11 @@
 									</c:choose>
 								</td>
 							</tr>
+							<tr>
+								<td colspan="2">
+									<hr size="1" style="width:500px;"/>
+								</td>
+							</tr>
 						</c:forEach>
 
 					</c:otherwise>
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/monitoring.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	2 Aug 2006 01:08:47 -0000	1.11
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	23 Aug 2006 05:42:37 -0000	1.12
@@ -1,13 +1,13 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
 
 <html:html>
 <head>
 	<title><fmt:message key="activity.title" /></title>
 	<lams:headItems />
-
+	<!-- ********************  CSS ********************** -->
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
 	<script type="text/javascript">
 		var imgRoot="${lams}images/";
 	    var themeName="aqua";
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/allmarks.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	1 Aug 2006 07:10:12 -0000	1.1
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	23 Aug 2006 05:42:37 -0000	1.2
@@ -14,20 +14,32 @@
 	</script>
 </head>
 <body>
+	<div id="page-learner">
+		<h1 class="no-tabs-below">
+			<fmt:message key="label.monitoring.heading.marking"/>
+		</h1>
 
-<table cellpadding="0">
-	<c:forEach var="user" items="${reports}">
-		<c:forEach items="${user.value}" var="fileInfo" varStatus="status">
-			<%@include file="filelist.jsp"%>
-		</c:forEach>
-	</c:forEach>
-	<tr>
-		<td colspan="2">
-			<html:link href="javascript:window.close();" property="submit" styleClass="button">
-				<bean:message key="label.monitoring.done.button" />
-			</html:link>
-		</td>
-	</tr>
-</table>
+		<div id="header-no-tabs-learner">
+
+		</div>
+		<div id="content-learner">
+			<table cellpadding="0">
+				<c:forEach var="user" items="${reports}">
+					<c:forEach items="${user.value}" var="fileInfo" varStatus="status">
+						<%@include file="filelist.jsp"%>
+					</c:forEach>
+				</c:forEach>
+				<tr>
+					<td colspan="2">
+						<html:link href="javascript:window.close();" property="submit" styleClass="button">
+							<bean:message key="label.monitoring.done.button" />
+						</html:link>
+					</td>
+				</tr>
+			</table>
+			</div>
+			<div id="footer-learner"></div>
+		</div>
+	</div>
 </body>
 </html>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/mark/filelist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/filelist.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/monitoring/mark/filelist.jsp	1 Aug 2006 07:10:12 -0000	1.1
+++ lams_tool_sbmt/web/monitoring/mark/filelist.jsp	23 Aug 2006 05:42:37 -0000	1.2
@@ -38,6 +38,6 @@
 			property="submit" styleClass="button">
 			<bean:message key="label.monitoring.updateMarks.button" />
 		</html:link>
-		<hr>
+		<hr size="1" style="width:500px"/>
 	</td>
 </tr>
Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/mark.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/monitoring/mark/mark.jsp	1 Aug 2006 07:10:12 -0000	1.1
+++ lams_tool_sbmt/web/monitoring/mark/mark.jsp	23 Aug 2006 05:42:37 -0000	1.2
@@ -13,20 +13,29 @@
 		}
 	</script>
 </head>
-
 <body>
-
-<table cellpadding="0">
-	<c:forEach var="fileInfo" items="${report}" varStatus="status">
-		<%@include file="filelist.jsp"%>
-	</c:forEach>
-	<tr>
-		<td colspan="2">
-			<html:link href="javascript:window.close();" property="submit" styleClass="button">
-				<bean:message key="label.monitoring.done.button" />
-			</html:link>
-		</td>
-	</tr>
-</table>
+	<div id="page-learner">
+		<h1 class="no-tabs-below">
+			<fmt:message key="label.monitoring.heading.marking"/>
+		</h1>
+		<div id="header-no-tabs-learner">
+		</div>
+		<div id="content-learner">
+				<table cellpadding="0">
+					<c:forEach var="fileInfo" items="${report}" varStatus="status">
+						<%@include file="filelist.jsp"%>
+					</c:forEach>
+					<tr>
+						<td colspan="2">
+							<html:link href="javascript:window.close();" property="submit" styleClass="button">
+								<bean:message key="label.monitoring.done.button" />
+							</html:link>
+						</td>
+					</tr>
+				</table>
+			</div>
+		<div id="footer-learner"></div>
+		</div>
+	</div>
 </body>
 </html>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/updatemark.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	1 Aug 2006 07:10:12 -0000	1.1
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	23 Aug 2006 05:42:37 -0000	1.2
@@ -6,55 +6,76 @@
 <head>
 	<title><fmt:message key="activity.title" /></title>
 	<lams:headItems />
-	
-	<script type="text/javascript">
-	</script>
+	<!-- ********************  CSS ********************** -->
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">	
 </head>
 
 <body>
-<c:forEach var="fileInfo"  items="${report}" varStatus="status">
-	<form id="updateMarkForm" method="post" action="<c:url value='/monitoring.do'/>">
-		<input type="hidden" name="method" value="updateMark" />
-		<input type="hidden" name="toolSessionID" value="${toolSessionID}" />
-		<input type="hidden" name="reportID" value="${fileInfo.reportID}" />
-		<input type="hidden" name="detailID" value="${fileInfo.uuID}" />
-		<input type="hidden" name="userID" value="${fileInfo.userDTO.userID}" />
-		<input type="hidden" name="updateMode" value="${updateMode}" />
-			<table cellpadding="0">
-				<%@include file="fileinfo.jsp"%>
-				<tr>
-					<td colspan="2">
-						<html:errors />
-					</td>
-				</tr>
-			
-				<tr>
-					<td class="field-name">
-						<fmt:message key="label.learner.marks" />
-					</td>
-					<td>
-						<input type="text" name="marks" value=<c:out value="${fileInfo.marks}"  escapeXml="false"/>>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<lams:SetEditor id="Comments" text="${fileInfo.comments}" small="true" key="label.learner.comments" />
-						<lams:HTMLEditor />
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<a href="javascript:history.back();" class="button">
-							<fmt:message key="label.cancel" />
-						</a>
-						&nbsp;&nbsp;
-						<a href="javascript:document.getElementById('updateMarkForm').submit();" class="button">
-							<fmt:message key="label.monitoring.saveMarks.button" />
-						</a>
-					</td>
-				</tr>
-			</table>
-	</form>
-</c:forEach>
+	<div id="page-learner">
+		<h1 class="no-tabs-below">
+			<fmt:message key="label.monitoring.updateMarks.button"/>
+		</h1>
+		<div id="header-no-tabs-learner">
+		</div>
+		<div id="content-learner">
+			<c:forEach var="fileInfo"  items="${report}" varStatus="status">
+				<form id="updateMarkForm" method="post" action="<c:url value='/monitoring.do'/>">
+					<input type="hidden" name="method" value="updateMark" />
+					<input type="hidden" name="toolSessionID" value="${toolSessionID}" />
+					<input type="hidden" name="reportID" value="${fileInfo.reportID}" />
+					<input type="hidden" name="detailID" value="${fileInfo.submissionID}" />
+					<input type="hidden" name="userID" value="${fileInfo.userDTO.userID}" />
+					<input type="hidden" name="updateMode" value="${updateMode}" />
+						<table cellpadding="0">
+							<%@include file="fileinfo.jsp"%>
+							<tr>
+								<td colspan="2">
+									<%@include file="/common/messages.jsp"%>
+								</td>
+							</tr>
+						
+							<tr>
+								<td class="field-name"  style="text-align: left;">
+									<fmt:message key="label.learner.marks" />
+								</td>
+								<td>
+									<input type="text" name="marks" value=<c:out value="${fileInfo.marks}"  escapeXml="false"/>>
+								</td>
+							</tr>
+							<tr>
+								<td colspan="2">
+									<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+									<span  class="field-name"><fmt:message key="label.learner.comments" /><BR></span>
+									<FCK:editor id="comments" basePath="/lams/fckeditor/"
+												imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+												linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+												flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+												imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+												linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+												flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+												toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
+												<c:out value="${fileInfo.comments}" escapeXml="false"/>
+									</FCK:editor>			
+								</td>
+							</tr>
+							<tr>
+								<td colspan="2">
+									<a href="javascript:history.back();" class="button">
+										<fmt:message key="label.cancel" />
+									</a>
+									&nbsp;&nbsp;
+									<a href="javascript:document.getElementById('updateMarkForm').submit();" class="button">
+										<fmt:message key="label.monitoring.saveMarks.button" />
+									</a>
+								</td>
+							</tr>
+						</table>
+				</form>
+			</c:forEach>
+			</div>
+
+		<div id="footer-learner"></div>
+		</div>
+	</div>
 </body>
 </html>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/parts/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/Attic/instructions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/monitoring/parts/instructions.jsp	1 Aug 2006 07:10:12 -0000	1.1
+++ lams_tool_sbmt/web/monitoring/parts/instructions.jsp	23 Aug 2006 05:42:37 -0000	1.2
@@ -1,23 +1,22 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<table cellpadding="0">
+<table cellpadding="0" border="0">
 	<!-- Instructions Row -->
 	<tr>
-		<td class="field-name">
+		<td class="field-name" width="30%">
 			<fmt:message key="label.authoring.online.instruction" />
 			:
 		</td>
-	</tr>
-	<tr>
 		<td>
 			<c:out value="${authoring.onlineInstruction}" escapeXml="false" />
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name" colspan="2">
+		<td class="field-name-alternative-color">
 			<fmt:message key="label.authoring.online.filelist" />
 			:
 		</td>
+		<td></td>
 	</tr>
 	<tr>
 		<td colspan="2">
@@ -28,35 +27,38 @@
 					<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
 						<fmt:message key="label.view" />
 					</html:link>
-					<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
+					&nbsp;&nbsp;
+					<c:set var="downloadURL">
+							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
+					</c:set>
+					<html:link href="${downloadURL}">
 						<fmt:message key="label.download" />
 					</html:link>
 				</li>
 			</c:forEach>
 			</ul>
 		</td>
 	</tr>
-</table>
-
-<hr />
-
-<table cellpadding="0">
 	<tr>
-		<td class="field-name-alternative-color">
-			<fmt:message key="label.authoring.offline.instruction" />
-			:
+		<td colspan="2">
+		<hr size="1" style="width:550px"/>
 		</td>
 	</tr>
 	<tr>
+		<td class="field-name" width="30%">
+			<fmt:message key="label.authoring.offline.instruction" />
+			:
+		</td>
 		<td>
 			<c:out value="${authoring.offlineInstruction}" escapeXml="false" />
 		</td>
 	</tr>
 	<tr>
-		<td class="field-name-alternative-color" colspan="2">
+		<td class="field-name-alternative-color">
 			<fmt:message key="label.authoring.offline.filelist" />
 			:
 		</td>
+		<td></td>		
 	</tr>
 	<tr>
 		<td colspan="2">
@@ -66,8 +68,11 @@
 						<c:out value="${file.name}" />
 						<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
 							<fmt:message key="label.view" />
-						</html:link>
-						<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
+						</html:link>&nbsp;&nbsp;
+						<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
+						</c:set>
+						<html:link href="${downloadURL}">
 							<fmt:message key="label.download" />
 						</html:link>
 					</li>