Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v
diff -u -r1.57 -r1.58
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	29 Mar 2014 02:16:23 -0000	1.57
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	9 Sep 2014 16:42:13 -0000	1.58
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -38,8 +37,7 @@
 			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 
-		<html:form action="/learning?method=displayMc&validate=false"
-			method="POST" target="_self" onsubmit="disableFinishButton();"  styleId="Form1">
+		<html:form action="/learning?method=displayMc&validate=false" method="POST" target="_self" onsubmit="disableFinishButton();"  styleId="Form1">
 			<html:hidden property="toolContentID" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="httpSessionID" />
@@ -50,22 +48,18 @@
 			<html:hidden property="learnerProgressUserId" />
 			<html:hidden property="questionListingMode" />
 
-
 			<c:choose>
-			<c:when test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
-
-				<h3>
-					<fmt:message key="label.individual.results.withRetries" />
-				</h3>
-
-			</c:when>
-			<c:when test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
-
-				<h3>
-					<fmt:message key="label.individual.results.withoutRetries" />
-				</h3>
-
-			</c:when>
+				<c:when test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
+					<h3>
+						<fmt:message key="label.individual.results.withRetries" />
+					</h3>
+				</c:when>
+				
+				<c:when test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
+					<h3>
+						<fmt:message key="label.individual.results.withoutRetries" />
+					</h3>
+				</c:when>
 			</c:choose>
 			
 			<c:if test="${(mcGeneralLearnerFlowDTO.retries == 'true') or (mcGeneralLearnerFlowDTO.displayAnswers == 'true')}">
@@ -78,22 +72,21 @@
 			</c:if>
 			
 			<p>
-				<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
-					<c:if test="${mcGeneralLearnerFlowDTO.userOverPassMark != 'true' && 
-									mcGeneralLearnerFlowDTO.passMarkApplicable == 'true' }">
+				<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'
+					&& mcGeneralLearnerFlowDTO.userOverPassMark != 'true'
+					&& mcGeneralLearnerFlowDTO.passMarkApplicable == 'true'}">
 
-						<fmt:message key="label.notEnoughMarks">
-							<fmt:param>
-								<c:if test="${mcGeneralLearnerFlowDTO.passMark != mcGeneralLearnerFlowDTO.totalMarksPossible}">
-									<fmt:message key="label.atleast" />
-								</c:if>
-								<c:out value="${mcGeneralLearnerFlowDTO.passMark}" />
-								<fmt:message key="label.outof" />
-								<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
-							</fmt:param>
-						</fmt:message>
-
-					</c:if>
+					<fmt:message key="label.notEnoughMarks">
+						<fmt:param>
+							<c:if test="${mcGeneralLearnerFlowDTO.passMark != mcGeneralLearnerFlowDTO.totalMarksPossible}">
+								<fmt:message key="label.atleast" />
+							</c:if>
+								
+							<c:out value="${mcGeneralLearnerFlowDTO.passMark}" />
+							<fmt:message key="label.outof" />
+							<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
+						</fmt:param>
+					</fmt:message>
 				</c:if>
 			</p>
 
@@ -120,24 +113,25 @@
 						</c:if>
 					</div>		
 
-						<p>
-							<c:out value="${dto.answerOption.mcQueOptionText}" escapeXml="false" />
+					<p>
+						<c:out value="${dto.answerOption.mcQueOptionText}" escapeXml="false" />
 								
-                    		<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
-								<c:if test="${dto.attemptCorrect == 'true'}">
-									<img src="<c:out value="${tool}"/>images/tick.gif" border="0" class="middle">
-								</c:if>
-								<c:if test="${dto.attemptCorrect != 'true'}">
-									<img src="<c:out value="${tool}"/>images/cross.gif" border="0" class="middle">
-								</c:if>
+                    	<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
+							<c:if test="${dto.attemptCorrect == 'true'}">
+								<img src="<c:out value="${tool}"/>images/tick.gif" border="0" class="middle">
 							</c:if>
-						</p>
+							<c:if test="${dto.attemptCorrect != 'true'}">
+								<img src="<c:out value="${tool}"/>images/cross.gif" border="0" class="middle">
+							</c:if>
+						</c:if>
+					</p>
 
-						<c:if test="${(dto.feedback != null) && (dto.feedback != '')}">
-							<div style="overflow: auto;">
-								<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${dto.feedback}" escapeXml="true" /> 
-							</div>		
-						</c:if>	
+					<c:if test="${(dto.feedback != null) && (dto.feedback != '')}">
+						<div style="overflow: auto;">
+							<strong> <fmt:message key="label.feedback.simple" /> </strong> 
+							<c:out value="${dto.feedback}" escapeXml="true" /> 
+						</div>		
+					</c:if>	
 				</div>
 			</c:forEach>
 
@@ -147,28 +141,26 @@
 				</h4>
 				
 				<table class="alternative-color" cellspacing="0">
-				  <tr>
-				  	<td width="30%"> 
-					  	  <strong> <fmt:message key="label.topMark"/> </strong>
-					 </td> 
-					 <td>	
-						  	 <c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
-				  	</td>
-				  </tr>	
+					<tr>
+				  		<td width="30%"> 
+							<strong> <fmt:message key="label.topMark"/> </strong>
+						</td> 
+						<td>	
+							<c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
+				  		</td>
+					</tr>	
 	
-				  <tr>
-				  	<td> 
-					  	 <strong><fmt:message key="label.avMark"/> </strong>
-				  	</td>
-				  	<td>
-						  	<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
-				  	</td>
-				  </tr>	
+				  	<tr>
+				  		<td> 
+					  		<strong><fmt:message key="label.avMark"/> </strong>
+				  		</td>
+				  		<td>
+							<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
+				  		</td>
+					</tr>	
 				</table>
-			</c:if>				
-			
+			</c:if>	
 
-
 			<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
 				<p>
 					<fmt:message key="label.learner.bestMark"/>
@@ -180,38 +172,11 @@
 				<html:submit property="redoQuestions" styleClass="button">
 					<fmt:message key="label.redo.questions" />
 				</html:submit>
-
-				<div class="space-bottom-top align-right">
-					<c:if
-						test="${((mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">
-						<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
-							<html:hidden property="learnerFinished" value="Finished" />
-							
-							<html:link href="#" styleClass="button" styleId="finishButton"  onclick="submitForm('finish');return false">
-								<span class="nextActivity">
-									<c:choose>
-					 					<c:when test="${activityPosition.last}">
-					 						<fmt:message key="label.submit" />
-					 					</c:when>
-					 					<c:otherwise>
-					 		 				<fmt:message key="label.finished" />
-					 					</c:otherwise>
-						 			</c:choose>
-						 		</span>
-							</html:link>
-						</c:if>
-
-						<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
-							<html:submit property="forwardtoReflection" styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:submit>
-						</c:if>
-					</c:if>
-				</div>
-
 			</c:if>
 
-			<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
+			<c:if test="${(mcGeneralLearnerFlowDTO.retries != 'true')
+				|| (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') 
+				&& (mcGeneralLearnerFlowDTO.userOverPassMark == 'true')}">
 
 				<div class="space-bottom-top align-right">
 					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
