Index: lams_tool_sbmt/web/monitoring/alluserlist.jsp
===================================================================
diff -u -rfa9a7729c95cc646e7bb7597de25a426f77815a2 -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/alluserlist.jsp	(.../alluserlist.jsp)	(revision fa9a7729c95cc646e7bb7597de25a426f77815a2)
+++ lams_tool_sbmt/web/monitoring/alluserlist.jsp	(.../alluserlist.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,61 +1,64 @@
 <%@include file="/common/taglibs.jsp"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-  	<div id="datatablecontainer">
-  		<c:set var="sessionUserMap" scope="request" value="${sessionUserMap}"/>
-  		<logic:notEmpty name="sessionUserMap">
-			<logic:iterate id="element" name="sessionUserMap">
-				<bean:define id="sessionDto" name="element" property="key"/>
-				<bean:define id="userlist" name="element" property="value"/>
-		  		<table class="forms">
-				    <tr>
-				        <td style="border-bottom:1px #000 solid;" colspan="4"><b><fmt:message key="label.session.name"/>: <c:out value="${sessionDto.sessionName}" /></td>
-				    </tr>
-			  		<logic:notEmpty name="userlist">
-						<logic:iterate id="user" name="userlist">
-							<tr>
-							<bean:define id="details" name="user" property="userID"/>
-							<html:hidden property="userID" value="${details}"/>
-							<html:hidden property="toolSessionID" value="${sessionDto.sessionID}"/>
-							<td class="formlabel"><b><bean:write name="user" property="firstName"/> <bean:write name="user" property="lastName"/></b></td>
-							<td class="formlabel"><b><bean:write name="user" property="login"/></b></td>
-							<td class="formcontrol">
-								<html:link href="javascript:doSubmit('getFilesUploadedByUser', 5);" property="Mark" styleClass="button">
-									<bean:message key="label.monitoring.Mark.button" />
-								</html:link>
-							</td>
-							</tr>		
-						</logic:iterate>
-			  		</logic:notEmpty>
-			  		<logic:empty name="userlist">
-			  			<tr><td colspan="3"><fmt:message key="label.no.user.available"/></td></tr>
-			  		</logic:empty>
-				    
-	  				<tr>
-			  			<td class="formcontrol">
-			  				<table class="forms">
-			  					<tr>
-			  						<td class="formcontrol">
-						  			<html:link href="javascript:doSubmit('viewAllMarks', 5);" property="viewAllMarks" styleClass="button">
-										<bean:message key="label.monitoring.viewAllMarks.button" />
-									</html:link>
-						  			</td>
-						  			<td class="formcontrol">
-						  			<html:link href="javascript:doSubmit('releaseMarks');" property="releaseMarks" styleClass="button">
-										<bean:message key="label.monitoring.releaseMarks.button" />
-									</html:link>
-						  			</td>
-						  			<td class="formcontrol">
-						  			<html:link href="javascript:doSubmit('downloadMarks');" property="downloadMarks" styleClass="button">
-										<bean:message key="label.monitoring.downloadMarks.button" />
-									</html:link>
-						  			</td>
-				  				</tr>
-							</table>
+
+<c:set var="sessionUserMap" scope="request" value="${sessionUserMap}" />
+<logic:notEmpty name="sessionUserMap">
+	<logic:iterate id="element" name="sessionUserMap">
+		<bean:define id="sessionDto" name="element" property="key" />
+		<bean:define id="userlist" name="element" property="value" />
+		<table cellpadding="0">
+			<tr>
+				<th colspan="3">
+					<fmt:message key="label.session.name" />
+					:
+					<c:out value="${sessionDto.sessionName}" />
+				</th>
+			</tr>
+			<logic:notEmpty name="userlist">
+				<logic:iterate id="user" name="userlist">
+					<tr>
+						<td>	
+							<bean:define id="details" name="user" property="userID" />
+							<html:hidden property="userID" value="${details}" />
+							<html:hidden property="toolSessionID" value="${sessionDto.sessionID}" />							
+							
+							<bean:write name="user" property="firstName" />
+							<bean:write name="user" property="lastName" />
 						</td>
+						<td>
+							<bean:write name="user" property="login" />
+						</td>
+						<td>
+							<html:link href="javascript:doSubmit('getFilesUploadedByUser', 5);" property="Mark" styleClass="button">
+								<bean:message key="label.monitoring.Mark.button" />
+							</html:link>
+						</td>
 					</tr>
-				</table>
-				<br><br>
-			</logic:iterate>
-
-  		</logic:notEmpty>  		
-	</div>
+				</logic:iterate>
+			</logic:notEmpty>
+			<logic:empty name="userlist">
+				<tr>
+					<td colspan="3">
+						<fmt:message key="label.no.user.available" />
+					</td>
+				</tr>
+			</logic:empty>
+			<tr>
+				<td>
+					<html:link href="javascript:doSubmit('viewAllMarks', 5);" property="viewAllMarks" styleClass="button">
+						<bean:message key="label.monitoring.viewAllMarks.button" />
+					</html:link>
+				</td>
+				<td>
+					<html:link href="javascript:doSubmit('releaseMarks');" property="releaseMarks" styleClass="button">
+						<bean:message key="label.monitoring.releaseMarks.button" />
+					</html:link>
+				</td>
+				<td>
+					<html:link href="javascript:doSubmit('downloadMarks');" property="downloadMarks" styleClass="button">
+						<bean:message key="label.monitoring.downloadMarks.button" />
+					</html:link>
+				</td>
+			</tr>
+		</table>
+	</logic:iterate>
+</logic:notEmpty>
Fisheye: Tag ead4c3740452c37fb2609e6703023a5fd7740068 refers to a dead (removed) revision in file `lams_tool_sbmt/web/monitoring/basic.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/monitoring/instructions.jsp
===================================================================
diff -u -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
+++ lams_tool_sbmt/web/monitoring/instructions.jsp	(.../instructions.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,53 +1,78 @@
-<%@ include file="/common/taglibs.jsp" %>
-	<table class="forms">
-		<!--hidden field contentID passed by flash-->
-		<tr>
-		</tr>
-		<!-- Instructions Row -->
-		<tr>
-			<td class="formlabel"><fmt:message
-				key="label.authoring.online.instruction" />:</td>
-			<td class="formcontrol">
-				<c:out value="${authoring.onlineInstruction}" escapeXml="false"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.online.filelist"/>:</td>
-			<td class="formcontrol">
-				<c:forEach var="file" items="${authoring.onlineFiles}">
-					<li><c:out value="${file.name}"/>
+<%@ include file="/common/taglibs.jsp"%>
+
+<table cellpadding="0">
+	<!-- Instructions Row -->
+	<tr>
+		<td class="field-name">
+			<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">
+			<fmt:message key="label.authoring.online.filelist" />
+			:
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+			<ul>
+			<c:forEach var="file" items="${authoring.onlineFiles}">
+				<li>
+					<c:out value="${file.name}" />
 					<html:link href="javascript:launchInstructionsPopup('download/?uuid=${file.uuID}&preferDownload=false')">
-						<fmt:message key="label.view"/>
+						<fmt:message key="label.view" />
 					</html:link>
 					<html:link href="../download/?uuid=${file.uuID}&preferDownload=true">
-						<fmt:message key="label.download"/>
+						<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>
+	</tr>
+	<tr>
+		<td>
+			<c:out value="${authoring.offlineInstruction}" escapeXml="false" />
+		</td>
+	</tr>
+	<tr>
+		<td class="field-name-alternative-color" colspan="2">
+			<fmt:message key="label.authoring.offline.filelist" />
+			:
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+			<ul>
+				<c:forEach var="file" items="${authoring.offlineFiles}">
+					<li>
+						<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">
+							<fmt:message key="label.download" />
+						</html:link>
 					</li>
 				</c:forEach>
-			</td>
-		</tr>
-		<tr><td colspan="2"><hr></td></tr>
-		<tr>
-			<td class="formlabel">
-			<fmt:message
-				key="label.authoring.offline.instruction" />:</td>
-			<td class="formcontrol">
-				<c:out value="${authoring.offlineInstruction}" escapeXml="false"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.offline.filelist"/>:</td>
-			<td class="formcontrol">
-				<c:forEach var="file" items="${authoring.offlineFiles}">
-					<li><c:out value="${file.name}"/></li>
-					<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">
-						<fmt:message key="label.download"/>
-					</html:link>
-				</c:forEach>
-			</td>
-		</tr>
-		</tr>
-	</table>
+			</ul>
+		</td>
+	</tr>
+</table>
Index: lams_tool_sbmt/web/monitoring/marking.jsp
===================================================================
diff -u -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/marking.jsp	(.../marking.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
+++ lams_tool_sbmt/web/monitoring/marking.jsp	(.../marking.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,20 +1,21 @@
-<%@ include file="/common/taglibs.jsp" %>
-				<table border="0" cellpadding="2" cellspacing="2">					
-					<tr>
-			  			<td class="formcontrol">
-			  			<html:link href="javascript:doSubmit('viewAllMarks', 5);" property="viewAllMarks" styleClass="button">
-							<bean:message key="label.monitoring.viewAllMarks.button" />
-						</html:link>
-			  			</td>
-			  			<td class="formcontrol">
-			  			<html:link href="javascript:doSubmit('releaseMarks');" property="releaseMarks" styleClass="button">
-							<bean:message key="label.monitoring.releaseMarks.button" />
-						</html:link>
-			  			</td>
-			  			<td class="formcontrol">
-			  			<html:link href="javascript:doSubmit('downloadMarks');" property="downloadMarks" styleClass="button">
-							<bean:message key="label.monitoring.downloadMarks.button" />
-						</html:link>
-			  			</td>
-	  				</tr>
-				</table>
\ No newline at end of file
+<%@ include file="/common/taglibs.jsp"%>
+
+<table cellpadding="0">
+	<tr>
+		<td>
+			<html:link href="javascript:doSubmit('viewAllMarks', 5);" property="viewAllMarks" styleClass="button">
+				<bean:message key="label.monitoring.viewAllMarks.button" />
+			</html:link>
+		</td>
+		<td>
+			<html:link href="javascript:doSubmit('releaseMarks');" property="releaseMarks" styleClass="button">
+				<bean:message key="label.monitoring.releaseMarks.button" />
+			</html:link>
+		</td>
+		<td>
+			<html:link href="javascript:doSubmit('downloadMarks');" property="downloadMarks" styleClass="button">
+				<bean:message key="label.monitoring.downloadMarks.button" />
+			</html:link>
+		</td>
+	</tr>
+</table>
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
diff -u -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,17 +1,20 @@
-<%@ include file="/common/taglibs.jsp" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<%@include file="/common/taglibs.jsp"%>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale="true">
-  <head>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
+<head>
 	<title><fmt:message key="activity.title" /></title>
-	<lams:headItems/>
-	<!-- this is the custom CSS for the tool -->
-	<link href="${tool}css/tool_custom.css" rel="stylesheet" type="text/css">
+	<lams:headItems />
 
- 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
 	<script type="text/javascript">
 		var imgRoot="${lams}images/";
 	    var themeName="aqua";
@@ -41,8 +44,8 @@
         } 
         
         function active(tabId) {
-        	if(document.getElementById("tab" + tabId).className == "tab tabcentre_inactive")
-        		return false;
+        	//if(document.getElementById("tab" + tabId).className == "tab tabcentre_inactive")
+        	//	return false;
         	return true;
         }
         
@@ -53,76 +56,75 @@
         	document.SbmtMonitoringForm.submit();
         }
 	</script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-    
-  </head>
-  
-  <body onLoad="init()">
-  
-  	<html:form action="monitoring" method="post">
-  		<html:hidden property="method"/>
-		<html:hidden property="currentTab" styleId="currentTab" />
-		
-  	<h1><bean:message key="label.monitoring.heading" /></h1>
-    <!-- start tabs -->
-		<lams:Tabs control="true">
-			<lams:Tab id="1" key="label.monitoring.heading.userlist"/>
-			<lams:Tab id="2" key="label.monitoring.heading.instructions"/>
-			<lams:Tab id="3" key="label.monitoring.heading.edit.activity"/>
-			<lams:Tab id="4" key="label.monitoring.heading.stats"/>
-			<lams:Tab id="5" key="label.monitoring.heading.marking" inactive="true"/>
-		</lams:Tabs>
-	<!-- end tab buttons -->
-	<div class="tabbody">
-		<html:errors/>	
-		
-		
-		
-		<!-- tab content 1 (Summary) -->
-		<lams:TabBody id="1" titleKey="label.monitoring.heading.userlist.desc" page="alluserlist.jsp"/>
-		<!-- end of content (Summary) -->
-		
-		<!-- tab content 2 (Instructions) -->
-		<lams:TabBody id="2" titleKey="label.monitoring.heading.instructions.desc" page="instructions.jsp"/>
-		<!-- end of content (Instructions) -->
-	  	
-	  	<!-- tab content 3 (Edit Activity) -->
-	  	<c:set var="activity_page" value="showactivity.jsp"/>
-		<c:if test="${SbmtMonitoringForm.map.method == 'editActivity'}">
-			<c:set var="activity_page" value="editactivity.jsp"/>
-		</c:if>
-		<lams:TabBody id="3" titleKey="label.monitoring.heading.edit.activity.desc" page="${activity_page}"/>
-		<!-- end of content (Edit Activity) -->
-	  	
-	  	<!-- tab content 4 (Stats) -->
-		<lams:TabBody id="4" titleKey="label.monitoring.heading.stats.desc" page="statistic.jsp"/>
-		<!-- end of content (Stats) -->
-	  	
-	  	<c:set var="marking_page" value="marking.jsp"/>
-	  	<c:if test="${SbmtMonitoringForm.map.method == 'viewAllMarks'}">
-	  		<c:set var="marking_page" value="viewallmarks.jsp"/>
-	  	</c:if>
-		<c:if test="${SbmtMonitoringForm.map.method == 'getFilesUploadedByUser' ||
+</head>
+
+<body onLoad="init()">
+	<div id="page">
+		<h1>
+			<bean:message key="label.monitoring.heading" />
+		</h1>
+		<div id="header">
+			<lams:Tabs control="true">
+				<lams:Tab id="1" key="label.monitoring.heading.userlist" />
+				<lams:Tab id="2" key="label.monitoring.heading.instructions" />
+				<lams:Tab id="3" key="label.monitoring.heading.edit.activity" />
+				<lams:Tab id="4" key="label.monitoring.heading.stats" />
+				<lams:Tab id="5" key="label.monitoring.heading.marking" inactive="true" />
+			</lams:Tabs>
+		</div>
+
+		<div id="content">
+			<html:form action="monitoring" method="post">
+				<html:hidden property="method" />
+				<html:hidden property="currentTab" styleId="currentTab" />
+				<html:errors />
+
+				<!-- tab content 1 (Summary) -->
+				<lams:TabBody id="1" titleKey="label.monitoring.heading.userlist.desc" page="alluserlist.jsp" />
+				<!-- end of content (Summary) -->
+
+				<!-- tab content 2 (Instructions) -->
+				<lams:TabBody id="2" titleKey="label.monitoring.heading.instructions.desc" page="instructions.jsp" />
+				<!-- end of content (Instructions) -->
+
+				<!-- tab content 3 (Edit Activity) -->
+				<c:set var="activity_page" value="showactivity.jsp" />
+				<c:if test="${SbmtMonitoringForm.map.method == 'editActivity'}">
+					<c:set var="activity_page" value="editactivity.jsp" />
+				</c:if>
+				<lams:TabBody id="3" titleKey="label.monitoring.heading.edit.activity.desc" page="${activity_page}" />
+				<!-- end of content (Edit Activity) -->
+
+				<!-- tab content 4 (Stats) -->
+				<lams:TabBody id="4" titleKey="label.monitoring.heading.stats.desc" page="statistic.jsp" />
+				<!-- end of content (Stats) -->
+
+				<c:set var="marking_page" value="marking.jsp" />
+				<c:if test="${SbmtMonitoringForm.map.method == 'viewAllMarks'}">
+					<c:set var="marking_page" value="viewallmarks.jsp" />
+				</c:if>
+				<c:if test="${SbmtMonitoringForm.map.method == 'getFilesUploadedByUser' ||
 					  SbmtMonitoringForm.map.method == 'updateMarks'}">
-			<c:set var="marking_page" value="usermarkslist.jsp"/>
-		</c:if>
-		<c:if test="${SbmtMonitoringForm.map.method == 'markFile'}">
-			<c:set var="marking_page" value="updatemarks.jsp"/>
-		</c:if>
+					<c:set var="marking_page" value="usermarkslist.jsp" />
+				</c:if>
+				<c:if test="${SbmtMonitoringForm.map.method == 'markFile'}">
+					<c:set var="marking_page" value="updatemarks.jsp" />
+				</c:if>
 
-	  	<!-- tab content 5 (Marking) -->
-		<lams:TabBody id="5" titleKey="label.monitoring.heading.marking.desc" page="${marking_page}"/>
-		<!-- end of content (Marking) -->
-	  	
-	  	<!-- Button Row -->
-		<p align="right">
-			<html:link href="javascript:;" property="submit" onclick="window.close()" styleClass="button">
-				<bean:message key="label.monitoring.done.button" />
-			</html:link>
-		</p>
-	</div>	
-	
-	<lams:HTMLEditor/>		
-	</html:form>
-  </body>
+				<!-- tab content 5 (Marking) -->
+				<lams:TabBody id="5" titleKey="label.monitoring.heading.marking.desc" page="${marking_page}" />
+				<!-- end of content (Marking) -->
+
+				<!-- Button Row -->
+				<p align="right">
+					<html:link href="javascript:;" property="submit" onclick="window.close()" styleClass="button">
+						<bean:message key="label.monitoring.done.button" />
+					</html:link>
+				</p>
+			</html:form>
+		</div>
+		<div id="footer"></div>
+	</div>
+	<lams:HTMLEditor />
+</body>
 </html:html>
Index: lams_tool_sbmt/web/monitoring/showactivity.jsp
===================================================================
diff -u -r7d117b285f81648e6f16ad1e70cc84bcb59d80e4 -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/showactivity.jsp	(.../showactivity.jsp)	(revision 7d117b285f81648e6f16ad1e70cc84bcb59d80e4)
+++ lams_tool_sbmt/web/monitoring/showactivity.jsp	(.../showactivity.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,42 +1,47 @@
-<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-	<div id="basic">
-		<h1><bean:message key="label.authoring.heading.basic.desc" /></h1>
-		<table class="forms">
-			<!--hidden field contentID passed by flash-->
-			<input type="hidden" name="toolContentID" value="<c:out value='${sessionScope.toolContentID}'/>"/>
-			<!-- Title Row -->
-			<tr>
-				<td class="formlabel"><bean:message key="label.authoring.basic.title" />:</td>
-				<td class="formcontrol">
-					<c:out value="${authoring.title}" escapeXml="false"/>
+<input type="hidden" name="toolContentID" value="<c:out value='${sessionScope.toolContentID}'/>" />
+<table cellpadding="0">
+	<tr>
+		<td class="field-name" width="30%">
+			<bean:message key="label.authoring.basic.title" />
+			:
+		</td>
+		<td>
+			<c:out value="${authoring.title}" escapeXml="false" />
+		</td>
+	</tr>
+	<!-- Instructions Row -->
+	<tr>
+		<td class="field-name" width="30%">
+			<bean:message key="label.authoring.basic.instruction" />
+			:
+		</td>
+		<td>
+			<c:out value="${authoring.instruction}" escapeXml="false" />
+		</td>
+	</tr>
+	<tr>
+		<c:set var="isPageEditable" value="${isPageEditable}" />
+		<c:choose>
+			<c:when test='${isPageEditable == "true"}'>
+				<td colspan="2">
+					<c:url value="/authoring.do" var="authoringUrl">
+						<c:param name="mode" value="teacher" />
+						<c:param name="toolContentID" value="${sessionScope.toolContentID}" />
+					</c:url>
+					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+						<fmt:message key="label.monitoring.edit.activity.edit" />
+					</html:link>
 				</td>
-			</tr>
-			<!-- Instructions Row -->
-			<tr>
-				<td class="formlabel"><bean:message key="label.authoring.basic.instruction" />:</td>
-				<td class="formcontrol">
-					<c:out value="${authoring.instruction}" escapeXml="false"/>
+			</c:when>
+			<c:otherwise>
+				<td colspan="2">
+					<p>
+						<fmt:message key="message.monitoring.edit.activity.not.editable" />
+					</p>
 				</td>
-			</tr>
-			<tr><td colspan="2">
-				<c:set var="isPageEditable" value="${isPageEditable}" />
-				<c:choose>
-					<c:when test='${isPageEditable == "true"}'>
-						<c:url value="/authoring.do" var="authoringUrl">
-							<c:param name="mode" value="teacher" />
-							<c:param name="toolContentID" value="${sessionScope.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>
-						<div align="center"><B>
-							<fmt:message key="message.monitoring.edit.activity.not.editable" />
-						</B></div>
-					</c:otherwise>
-				</c:choose>
-			</td></tr>
-		</table>
-	</div>
\ No newline at end of file
+			</c:otherwise>
+		</c:choose>
+	</tr>
+</table>
Index: lams_tool_sbmt/web/monitoring/statistic.jsp
===================================================================
diff -u -rfa9a7729c95cc646e7bb7597de25a426f77815a2 -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/statistic.jsp	(.../statistic.jsp)	(revision fa9a7729c95cc646e7bb7597de25a426f77815a2)
+++ lams_tool_sbmt/web/monitoring/statistic.jsp	(.../statistic.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,29 +1,37 @@
-<%@ include file="/common/taglibs.jsp" %>
-	<div class="datatablecontainer">
-		<c:forEach var="element" items="${statisticList}">
-			<c:set var="sessionName" value="${element.key.sessionName}"/>
-			<c:set var="statistic" value="${element.value}"/>
-			<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-		    <tr>
-		        <td style="border-bottom:1px #000 solid;" colspan="2"><b><fmt:message key="label.session.name"/>: <c:out value="${sessionName}" /></td>
-		    </tr>
-		    <tr>
-			    <th scope="col"><fmt:message key="label.authoring.basic.title"/></th>
-			    <th scope="col"><fmt:message key="label.count"/></th>
-			  </tr>
-			  <tr>
-			    <td><bean:message key="monitoring.statistic.marked"/></td>
-			    <td><c:out value="${statistic.markedCount}"/></td>
-			  </tr>
-			  <tr>
-			    <td><bean:message key="monitoring.statistic.not.marked"/></td>
-			    <td><c:out value="${statistic.notMarkedCount}"/></td>
-			  </tr>
-			  <tr>
-			    <td><bean:message key="monitoring.statistic.total.uploaded.file"/></td>
-			    <td><c:out value="${statistic.totalUploadedFiles}"/></td>
-			  </tr>
-			</table>
-		</c:forEach>
-	</div>
+<%@ include file="/common/taglibs.jsp"%>
 
+<c:forEach var="element" items="${statisticList}">
+	<c:set var="sessionName" value="${element.key.sessionName}" />
+	<c:set var="statistic" value="${element.value}" />
+	<table cellpadding="0">
+		<tr>
+			<th colspan="2">
+				<fmt:message key="label.session.name" />: <c:out value="${sessionName}" />
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<bean:message key="monitoring.statistic.marked" />
+			</td>
+			<td>
+				<c:out value="${statistic.markedCount}" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<bean:message key="monitoring.statistic.not.marked" />
+			</td>
+			<td>
+				<c:out value="${statistic.notMarkedCount}" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<bean:message key="monitoring.statistic.total.uploaded.file" />
+			</td>
+			<td>
+				<c:out value="${statistic.totalUploadedFiles}" />
+			</td>
+		</tr>
+	</table>
+</c:forEach>
Fisheye: Tag ead4c3740452c37fb2609e6703023a5fd7740068 refers to a dead (removed) revision in file `lams_tool_sbmt/web/monitoring/tabmenu.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/monitoring/updatemarks.jsp
===================================================================
diff -u -rfa9a7729c95cc646e7bb7597de25a426f77815a2 -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision fa9a7729c95cc646e7bb7597de25a426f77815a2)
+++ lams_tool_sbmt/web/monitoring/updatemarks.jsp	(.../updatemarks.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,14 +1,24 @@
 <%@ include file="/common/taglibs.jsp"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
+
 <c:set var="details" value="${fileDetails}" />
 <c:set var="user" value="${user}" />
 <c:set var="toolSessionID" value="${toolSessionID}" />
-<b><fmt:message key="label.assign.mark.message.prefix"/>: <c:out value="${user.login}" /> , <c:out value="${user.firstName}" /> <c:out value="${user.lastName}" /> </b>
-</p>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-	<span>
+
+<table cellpadding="0">
+
 	<tr>
-		<td>
+		<td colspan="2">
+			<fmt:message key="label.assign.mark.message.prefix" />
+			:
+			<c:out value="${user.login}" />
+			,
+			<c:out value="${user.firstName}" />
+			<c:out value="${user.lastName}" />
+		</td>
+	</tr>
+
+	<tr>
+		<td class="field-name" width="30%">
 			<fmt:message key="label.learner.filePath" />
 			:
 		</td>
@@ -17,7 +27,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>
+		<td class="field-name" width="30%">
 			<fmt:message key="label.learner.fileDescription" />
 			:
 		</td>
@@ -26,16 +36,15 @@
 		</td>
 	</tr>
 	<tr>
-		<td>
+		<td class="field-name" width="30%">
 			<fmt:message key="label.learner.dateOfSubmission" />
 			:
 		</td>
 		<td>
 			<c:out value="${details.dateOfSubmission}" />
 		</td>
 	</tr>
-</table>
-<table class="forms">
+
 	<tr>
 		<td colspan="2">
 			<html:errors />
@@ -45,30 +54,24 @@
 	<input type="hidden" name="reportID" value="<c:out value='${details.reportID}'/>" />
 	<input type="hidden" name="userID" value="<c:out value='${user.userID}'/>" />
 	<tr>
-		<td class="formlabel">
+		<td class="field-name">
 			<fmt:message key="label.learner.marks" />
 			:
 		</td>
-		<td class="formcontrol">
+		<td>
 			<input type="text" name="marks" value=<c:out value="${details.marks}"  escapeXml="false"/>>
 		</td>
 	</tr>
 	<tr>
-		<td class="formlabel">
-			<fmt:message key="label.learner.comments" />
-			:
+		<td colspan="2">
+			<lams:SetEditor id="Comments" text="${details.comments}" small="true" key="label.learner.comments" />
 		</td>
-		<td class="formcontrol">
-			<lams:SetEditor id="Comments" text="${details.comments}" small="true" />
-		</td>
 	</tr>
 	<tr>
-		<td class="formcontrol" colspan="2">
+		<td colspan="2">
 			<html:link href="javascript:doSubmit('updateMarks');" property="submit" styleClass="button">
 				<bean:message key="label.monitoring.saveMarks.button" />
 			</html:link>
 		</td>
 	</tr>
-	</form>
-	</span>
 </table>
Index: lams_tool_sbmt/web/monitoring/usermarkslist.jsp
===================================================================
diff -u -rfa9a7729c95cc646e7bb7597de25a426f77815a2 -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/usermarkslist.jsp	(.../usermarkslist.jsp)	(revision fa9a7729c95cc646e7bb7597de25a426f77815a2)
+++ lams_tool_sbmt/web/monitoring/usermarkslist.jsp	(.../usermarkslist.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,13 +1,24 @@
 <%@ include file="/common/taglibs.jsp"%>
+
 <c:set var="filesUploaded" value="${userReport}" />
 <c:set var="user" value="${user}" />
-<b><c:out value="${user.login}" /> , <c:out value="${user.firstName}" /> <c:out value="${user.lastName}" />, <fmt:message key="label.submit.file.suffix" />: </b>
-</p>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+
+<table cellpadding="0">
+	<tr>
+		<td colspan="2">
+			<c:out value="${user.login}" />
+			,
+			<c:out value="${user.firstName}" />
+			<c:out value="${user.lastName}" />
+			,
+			<fmt:message key="label.submit.file.suffix" />
+			:
+		</td>
+	</tr>
 	<c:forEach var="details" items="${filesUploaded}">
 		<span><p>
 		<tr>
-			<td>
+			<td class="field-name">
 				<fmt:message key="label.learner.filePath" />
 				:
 			</td>
@@ -24,7 +35,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td>
+			<td class="field-name">
 				<fmt:message key="label.learner.fileDescription" />
 				:
 			</td>
@@ -33,7 +44,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td>
+			<td class="field-name">
 				<fmt:message key="label.learner.dateOfSubmission" />
 				:
 			</td>
@@ -42,7 +53,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td>
+			<td class="field-name">
 				<fmt:message key="label.learner.marks" />
 				:
 			</td>
@@ -58,7 +69,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td>
+			<td class="field-name">
 				<fmt:message key="label.learner.comments" />
 				:
 			</td>
Index: lams_tool_sbmt/web/monitoring/viewallmarks.jsp
===================================================================
diff -u -rfa9a7729c95cc646e7bb7597de25a426f77815a2 -read4c3740452c37fb2609e6703023a5fd7740068
--- lams_tool_sbmt/web/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision fa9a7729c95cc646e7bb7597de25a426f77815a2)
+++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision ead4c3740452c37fb2609e6703023a5fd7740068)
@@ -1,26 +1,27 @@
 <%@ include file="/common/taglibs.jsp"%>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+
+<table cellpadding="0">
 	<c:forEach items="${report}" var="user">
 		<c:set var="filesUploaded" value="${user.value}" />
 		<c:set var="first" value="true" />
 		<c:forEach items="${filesUploaded}" var="details">
-			<p>
-				<c:if test="${first}">
-					<c:set var="first" value="false" />
-					<tr>
-						<td colspan="2">
-							<c:out value="${details.userDTO.firstName}" />
-							<c:out value="${details.userDTO.lastName}" />
-							,
-							<c:out value="${details.userDTO.login}" />
-							,
-							<fmt:message key="label.submit.file.suffix" />
-							:
-						</td>
-					<tr>
-				</c:if>
+			<c:if test="${first}">
+				<c:set var="first" value="false" />
+				<tr>
+					<td colspan="2">
+						<c:out value="${details.userDTO.firstName}" />
+						<c:out value="${details.userDTO.lastName}" />
+						,
+						<c:out value="${details.userDTO.login}" />
+						,
+						<fmt:message key="label.submit.file.suffix" />
+						:
+					</td>
+				<tr>
+			</c:if>
+
 			<tr>
-				<td>
+				<td class="field-name">
 					<fmt:message key="label.learner.filePath" />
 					:
 				</td>
@@ -35,10 +36,9 @@
 					</c:set>
 					<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="label.download" /> </a>
 				</td>
-
 			</tr>
 			<tr>
-				<td>
+				<td class="field-name">
 					<fmt:message key="label.learner.fileDescription" />
 					:
 				</td>
@@ -47,7 +47,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>
+				<td class="field-name">
 					<fmt:message key="label.learner.dateOfSubmission" />
 					:
 				</td>
@@ -56,7 +56,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>
+				<td class="field-name">
 					<fmt:message key="label.learner.marks" />
 					:
 				</td>
@@ -72,7 +72,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>
+				<td class="field-name">
 					<fmt:message key="label.learner.comments" />
 					:
 				</td>