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.29 -r1.30
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	11 Oct 2006 22:44:03 -0000	1.29
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	15 Oct 2006 15:17:39 -0000	1.30
@@ -162,45 +162,35 @@
 						</td>
 					</tr>
 
-					
 			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
 		  	   		  <tr>
-					  	<td NOWRAP colspan=2 valign=top> 
+					  	<td NOWRAP  valign=top> 
 					  			<html:submit property="redoQuestions" styleClass="button">
 									<bean:message key="label.redo.questions"/>
 								</html:submit>	 		
 			       
 		   						<html:submit property="viewSummary" styleClass="button">
 									<bean:message key="label.view.summary"/>
 								</html:submit>	 				 		  					
-
-								<c:if test="${((mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">
-									<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-										<html:submit property="learnerFinished"  styleClass="button">
-											<bean:message key="label.finished"/>
-										</html:submit>	 				
-								  	</c:if> 				    					
-					
-									<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-										<html:submit property="forwardtoReflection" styleClass="button">
-											<bean:message key="label.continue"/>
-										</html:submit>	 				
-								  	</c:if> 				    					
-						  	   </c:if>	
-								<c:if test="${(mcGeneralLearnerFlowDTO.passMarkApplicable != 'true')}">
-									<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-										<html:submit property="learnerFinished"  styleClass="button">
-											<bean:message key="label.finished"/>
-										</html:submit>	 				
-								  	</c:if> 				    					
-					
-									<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-										<html:submit property="forwardtoReflection" styleClass="button">
-											<bean:message key="label.continue"/>
-										</html:submit>	 				
-								  	</c:if> 				    					
-						  	   </c:if>	
 					  	 </td>
+
+					  	<td NOWRAP  valign=top> 
+		  						<div class="right-buttons">												
+									<c:if test="${((mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">
+										<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
+											<html:submit property="learnerFinished"  styleClass="button">
+												<bean:message key="label.finished"/>
+											</html:submit>	 				
+									  	</c:if> 				    					
+						
+										<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
+											<html:submit property="forwardtoReflection" styleClass="button">
+												<bean:message key="label.continue"/>
+											</html:submit>	 				
+									  	</c:if> 				    					
+							  	   </c:if>	
+							</div>						   						  	   
+					  	 </td>							
 					  </tr>
 					</c:if> 																		
 
Index: lams_tool_lamc/web/learning/RedoQuestions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/RedoQuestions.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/web/learning/RedoQuestions.jsp	2 Oct 2006 04:42:17 -0000	1.19
+++ lams_tool_lamc/web/learning/RedoQuestions.jsp	15 Oct 2006 15:17:39 -0000	1.20
@@ -105,7 +105,7 @@
 					  
 					  
 				  <tr>
-				  	<td NOWRAP colspan=2 align=left valign=top> 
+				  	<td NOWRAP align=left valign=top> 
 				  			<html:submit property="viewAnswers" styleClass="button">
 								<bean:message key="label.view.answers"/>
 							</html:submit>	 		
@@ -114,9 +114,50 @@
 								<bean:message key="label.redo.questions"/>
 							</html:submit>	 				 		  					
 				  	 </td>
+
+				  	 
+		 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
+
+					  	<td NOWRAP valign=top> 
+    	  						<div class="right-buttons">					  	
+									<c:if test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
+										<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
+											<html:submit property="learnerFinished"  styleClass="button">
+												<bean:message key="label.finished"/>
+											</html:submit>	 				
+									  	</c:if> 				    					
+						
+										<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
+											<html:submit property="forwardtoReflection" styleClass="button">
+												<bean:message key="label.continue"/>
+											</html:submit>	 				
+									  	</c:if> 				    					
+							  	   </c:if>	
+							</div>						  	   
+					  	 </td>
+					</c:if>
+					
+					<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 							  
+ 			  	   		    <td  valign=top>
+	    	  						<div class="right-buttons">
+										<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
+										<html:submit property="learnerFinished"  styleClass="button">
+											<bean:message key="label.finished"/>
+										</html:submit>	 				
+								  	</c:if> 				    					
+					
+									<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
+										<html:submit property="forwardtoReflection" styleClass="button">
+											<bean:message key="label.continue"/>
+										</html:submit>	 				
+								  	</c:if> 				    					
+								   
+								</div>
+					  	 </td>
+					</c:if> 																		
+				  	 
 				  </tr>
 			 </table>
-
 			
 		 	</div>
 
Index: lams_tool_lamc/web/learning/ResultsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/ResultsSummary.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_lamc/web/learning/ResultsSummary.jsp	2 Oct 2006 04:42:17 -0000	1.22
+++ lams_tool_lamc/web/learning/ResultsSummary.jsp	15 Oct 2006 15:17:39 -0000	1.23
@@ -116,19 +116,40 @@
 							  	<c:out value="${mcGeneralLearnerFlowDTO.lowestMark}"/>
 					  	</td>
 					  </tr>	
-					  
 
 
-		 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
-	  	   		  <tr>
-				  	<td NOWRAP colspan=2  valign=top> 
+			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
+		  	   		  <tr>
+					  	<td NOWRAP valign=top> 
 					  			<html:submit property="redoQuestions" styleClass="button">
 									<bean:message key="label.redo.questions"/>
 								</html:submit>	 		
-				  	 </td>
-				  </tr>
-				</c:if> 																		
+					  	 </td>
 
+
+					  	<td NOWRAP valign=top> 					  	 
+       	  						<div class="right-buttons">	  	   		    
+									<c:if test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
+										<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
+											<html:submit property="learnerFinished"  styleClass="button">
+												<bean:message key="label.finished"/>
+											</html:submit>	 				
+									  	</c:if> 				    					
+						
+										<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
+											<html:submit property="forwardtoReflection" styleClass="button">
+												<bean:message key="label.continue"/>
+											</html:submit>	 				
+									  	</c:if> 				    					
+							  	   </c:if>	
+						  	   </div>						   						  	   
+					  	 </td>						  	   
+					  	 
+					  </tr>
+					</c:if> 				
+				
+				
+
 				<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 							  
 	  	   		  <tr>
 	  	   		    <td NOWRAP colspan=2 valign=top>
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.32 -r1.33
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	2 Oct 2006 04:42:17 -0000	1.32
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	15 Oct 2006 15:17:39 -0000	1.33
@@ -166,30 +166,22 @@
 
 					<c:if test="${mcGeneralLearnerFlowDTO.reportViewOnly != 'true'}"> 							  
 						<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}"> 							  
-						 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
-					  	   		  <tr>
-								  	<td NOWRAP valign=top> 
-								  			<html:submit property="redoQuestions" styleClass="button">
-												<bean:message key="label.redo.questions"/>
-											</html:submit>	 		
-						       
-					   						<html:submit property="viewSummary" styleClass="button">
-												<bean:message key="label.view.summary"/>
-											</html:submit>	 				 		  					
-								  	 </td>
-								  </tr>
-								</c:if> 																		
-			
-								<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 							  
-					  	   		  <tr>
-					  	   		    <td  valign=top>
-						   						<html:submit property="viewSummary" styleClass="button">
-													<bean:message key="label.view.summary"/>
-												</html:submit>	 				 		  					
-								  	 </td>
-								  	 
-		 			  	   		    <td  valign=top>
-			    	  						<div class="right-buttons">
+
+					 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
+				  	   		  <tr>
+							  	<td NOWRAP valign=top> 
+							  			<html:submit property="redoQuestions" styleClass="button">
+											<bean:message key="label.redo.questions"/>
+										</html:submit>	 		
+					       
+				   						<html:submit property="viewSummary" styleClass="button">
+											<bean:message key="label.view.summary"/>
+										</html:submit>	 				 		  					
+							  	 </td>
+
+							  	<td NOWRAP valign=top> 							  	 
+             	  						<div class="right-buttons">	  	   		    
+											<c:if test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
 												<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
 													<html:submit property="learnerFinished"  styleClass="button">
 														<bean:message key="label.finished"/>
@@ -201,12 +193,40 @@
 														<bean:message key="label.continue"/>
 													</html:submit>	 				
 											  	</c:if> 				    					
-											   
-											</div>
-								  	 </td>
-								  	 
-								  </tr>
-								</c:if> 																		
+									  	   </c:if>	
+									  	   
+									</div>								  	   
+							  	 </td>									
+							  </tr>
+							</c:if> 				
+			
+							<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 							  
+				  	   		  <tr>
+				  	   		    <td  valign=top>
+					   						<html:submit property="viewSummary" styleClass="button">
+												<bean:message key="label.view.summary"/>
+											</html:submit>	 				 		  					
+							  	 </td>
+							  	 
+	 			  	   		    <td  valign=top>
+		    	  						<div class="right-buttons">
+											<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
+												<html:submit property="learnerFinished"  styleClass="button">
+													<bean:message key="label.finished"/>
+												</html:submit>	 				
+										  	</c:if> 				    					
+							
+											<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
+												<html:submit property="forwardtoReflection" styleClass="button">
+													<bean:message key="label.continue"/>
+												</html:submit>	 				
+										  	</c:if> 				    					
+										   
+										</div>
+							  	 </td>
+							  	 
+							  </tr>
+							</c:if> 																		
 						</c:if> 																								
 					</c:if>