Index: lams_tool_sbmt/web/monitoring/viewallmarks.jsp
===================================================================
diff -u -r2fa28f2cc0de566ad80510bd586c96b4c52fa33a -rfa9a7729c95cc646e7bb7597de25a426f77815a2
--- lams_tool_sbmt/web/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 2fa28f2cc0de566ad80510bd586c96b4c52fa33a)
+++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision fa9a7729c95cc646e7bb7597de25a426f77815a2)
@@ -1,87 +1,111 @@
-<%@ include file="/common/taglibs.jsp" %>
-		<table width="100%"  border="0" cellspacing="0" 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}"/>, provides following submisstion:
-					    	</td>
-					    <tr>
-				    </c:if>
-				<tr>
-					<td>File Path: </td>
-					<td><c:out value="${details.filePath}" /> 
-						<c:set var="viewURL">
-							<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&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=${details.uuID}&versionID=${details.versionID}&preferDownload=true"/>
-						</c:set>
-						<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-									<fmt:message key="label.download"/>
-						</a>
-					</td>					
-					
-				</tr>
-				<tr>
-					<td>File Description: </td><td><c:out value="${details.fileDescription}"  escapeXml="false"/></td>
-				</tr>
-				<tr>
-					<td>Date of Submission: </td><td><c:out value="${details.dateOfSubmission}" /></td>
-				</tr>
-				<tr>
-					<td>Marks:</td>
-					<td> 		<c:choose>
-										<c:when test="${empty details.marks}">
-											<c:out value="Not Available"/>
-										</c:when>
-										<c:otherwise>
-											<c:out value="${details.marks}" escapeXml="false"/>
-										</c:otherwise>
-									</c:choose>
-					</td>
-				</tr>			
-				<tr>
-					<td>Comments:</td>
-					<td>
-									<c:choose>
-										<c:when test="${empty details.comments}">
-											<c:out value="Not Available"/>								
-										</c:when>
-										<c:otherwise>
-											<c:out value="${details.comments}" escapeXml="false"/>
-										</c:otherwise>
-									</c:choose>
-					</td>
-				</tr>
-		
-				<tr>
-					<td colspan="2">
-							<input type="hidden" name="detailID" value=<c:out value='${details.submissionID}' /> >
-							<input type="hidden" name="reportID" value=<c:out value='${details.reportID}' /> >
-							<input type="hidden" name="userID" value=<c:out value='${details.userID}' /> >
-							<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' /> >
-							<html:link href="javascript:doSubmit('markFile');" property="submit" styleClass="button">
-								<bean:message key="label.monitoring.updateMarks.button" />
-							</html:link>
-					</td>
-				</tr>
-			</c:forEach>
-		</c:forEach>
+<%@ include file="/common/taglibs.jsp"%>
+<table width="100%" border="0" cellspacing="0" 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>
 			<tr>
+				<td>
+					<fmt:message key="label.learner.filePath" />
+					:
+				</td>
+				<td>
+					<c:out value="${details.filePath}" />
+					<c:set var="viewURL">
+						<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&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=${details.uuID}&versionID=${details.versionID}&preferDownload=true" />
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="label.download" /> </a>
+				</td>
+
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="label.learner.fileDescription" />
+					:
+				</td>
+				<td>
+					<c:out value="${details.fileDescription}" escapeXml="false" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="label.learner.dateOfSubmission" />
+					:
+				</td>
+				<td>
+					<c:out value="${details.dateOfSubmission}" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="label.learner.marks" />
+					:
+				</td>
+				<td>
+					<c:choose>
+						<c:when test="${empty details.marks}">
+							<fmt:message key="label.learner.notAvailable" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${details.marks}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="label.learner.comments" />
+					:
+				</td>
+				<td>
+					<c:choose>
+						<c:when test="${empty details.comments}">
+							<fmt:message key="label.learner.notAvailable" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${details.comments}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+
+			<tr>
 				<td colspan="2">
-					<html:link href="javascript:doSubmit('unspecified', 1);" property="submit" styleClass="button">
-							<bean:message key="label.monitoring.finishedMarks.button" />
+					<input type="hidden" name="detailID" value=<c:out value='${details.submissionID}' />>
+					<input type="hidden" name="reportID" value=<c:out value='${details.reportID}' />>
+					<input type="hidden" name="userID" value=<c:out value='${details.userID}' />>
+					<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' />>
+					<html:link href="javascript:doSubmit('markFile');" property="submit" styleClass="button">
+						<bean:message key="label.monitoring.updateMarks.button" />
 					</html:link>
 				</td>
 			</tr>
-		</table>	
+		</c:forEach>
+	</c:forEach>
+	<tr>
+		<td colspan="2">
+			<html:link href="javascript:doSubmit('unspecified', 1);" property="submit" styleClass="button">
+				<bean:message key="label.monitoring.finishedMarks.button" />
+			</html:link>
+		</td>
+	</tr>
+</table>