Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_laqa/web/learning/AnswersContent.jsp	28 Sep 2006 23:30:58 -0000	1.19
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	10 Oct 2006 16:17:27 -0000	1.20
@@ -90,17 +90,32 @@
 					<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false"/> 
 				</td></tr>
 	
-				<tr> <td NOWRAP>
-					 <c:out value="${generalLearnerFlowDTO.userFeedback}" escapeXml="true"/> 
-				</td></tr>
 			
 				<c:choose> 
 				  <c:when test="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}" > 
+		
+				  		<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}"> 							  		
+						  	<tr> <td NOWRAP>
+			 					<bean:message key="label.feedback.seq"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> &nbsp
+			 					<bean:message key="label.questions.simple"/>
+							</td></tr>
+						</c:if> 									
+				  		<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}"> 							  		
+						  	<tr> <td NOWRAP>				  		
+			 					<bean:message key="label.questions.remaining"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> 
+							</td></tr>			 					
+						</c:if> 													  		
+				  
 						<jsp:include page="/learning/SequentialAnswersContent.jsp" /> 
-					  </c:when> 
+				  </c:when> 
 
-					  <c:otherwise>
-						  	<jsp:include page="/learning/CombinedAnswersContent.jsp" /> 
+				  <c:otherwise>
+					  	<tr> <td NOWRAP>
+		 					<bean:message key="label.feedback.combined"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> &nbsp
+		 					<bean:message key="label.questions.simple"/>
+						</td></tr>
+				  
+					  	<jsp:include page="/learning/CombinedAnswersContent.jsp" /> 
 				  </c:otherwise>
 				</c:choose> 
 			</c:if>