Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/learning.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_assessment/web/pages/learning/learning.jsp	18 May 2011 18:48:24 -0000	1.16
+++ lams_tool_assessment/web/pages/learning/learning.jsp	2 Jun 2011 04:18:30 -0000	1.17
@@ -174,71 +174,15 @@
 		<br>
 		
 		<%@ include file="parts/attemptsummary.jsp"%>
-
-		<form id="answers" name="answers" method="post" >
-			<table cellspacing="0" class="alternative-color">
-				<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
-					<tr>
-						<td style="padding: 15px 15px 15px; width: 10px; font-weight: bold;" >
-							${status.index + sessionMap.questionNumberingOffset} 
-						</td>
-						<td style="padding-left: 0px;">
-							<input type="hidden" name="questionUid${status.index}" id="questionUid${status.index}" value="${question.uid}" />						
-							
-							<div class="field-name" style="padding: 10px 15px 15px;">
-								${question.question}
-							</div>
-							
-							<c:choose>
-								<c:when test="${question.type == 1}">
-									<%@ include file="parts/multiplechoice.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 2}">
-									<%@ include file="parts/matchingpairs.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 3}">
-									<%@ include file="parts/shortanswer.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 4}">
-									<%@ include file="parts/numerical.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 5}">
-									<%@ include file="parts/truefalse.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 6}">
-									<%@ include file="parts/essay.jsp"%>
-								</c:when>
-								<c:when test="${question.type == 7}">
-									<%@ include file="parts/ordering.jsp"%>
-								</c:when>
-							</c:choose>
-							
-							<%@ include file="parts/questionsummary.jsp"%>
-						</td>
-					</tr>
-				</c:forEach>
-			</table>
-		</form>
 		
-		<!--Paging-->
-		<c:if test="${fn:length(sessionMap.pagedQuestions) > 1}">
-			<div style="text-align: center; padding-top: 60px;">
-				<fmt:message key="label.learning.page" />
-				<c:forEach var="questions" items="${sessionMap.pagedQuestions}" varStatus="status">
-					<c:choose>
-						<c:when	test="${(status.index+1) == pageNumber}">
-							<a href="#" onclick="return nextPage(${status.index + 1})" style="margin-left: 10px; font-size: 130%; color: red;">
-						</c:when>
-						<c:otherwise>
-							<a href="#" onclick="return nextPage(${status.index + 1})" style="margin-left: 10px; font-size: 130%;">
-						</c:otherwise>
-					</c:choose>				
-						${status.index + 1} 
-					</a>
-				</c:forEach>		
-			</div>
+		<c:if test="${not finishedLock}">
+			<%@ include file="parts/allquestions.jsp"%>
 		</c:if>
 
+		<c:if test="${finishedLock && assessment.displaySummary}">
+			<%@ include file="parts/allquestions.jsp"%>
+		</c:if>
+
 		<c:if test="${mode != 'teacher'}">
 			<div class="space-bottom-top align-right">
 				<c:choose>