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.16 -r1.17
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	10 Oct 2006 04:19:47 -0000	1.16
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	10 Oct 2006 05:21:31 -0000	1.17
@@ -74,7 +74,17 @@
 			<td colspan="2">
 				<input type="submit" value="<fmt:message key="lable.update.mark"/>" class="button" />
 				&nbsp;&nbsp;
-				<input type="button" onclick="javascript:history.back();" class="button" value="<fmt:message key="button.cancel"/>">
+				<c:if test="${updateMode == 'listMarks'}">
+					<c:set var="cancelUrl">
+						<c:url value="/monitoring/viewUserMark.do"/>?userID=${user.uid}&toolSessionID=${toolSessionID}
+					</c:set>
+				</c:if>
+				<c:if test="${updateMode == 'listAllMarks'}">
+					<c:set var="cancelUrl">
+						<c:url value="/monitoring/viewAllMarks.do"/>?toolSessionID=${toolSessionID}
+					</c:set>
+				</c:if>
+				<input type="button" onclick="location.href='${cancelUrl}';" class="button" value="<fmt:message key="button.cancel"/>">
 			</td>
 		</tr>
 	</table>