Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	8 Jun 2007 01:38:43 -0000	1.12
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	5 Oct 2007 06:04:56 -0000	1.13
@@ -331,68 +331,41 @@
 				</c:if>				
 
 
+			<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
+				<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
+					<br>
+					<html:button property="redoQuestions" styleClass="button"
+						onclick="submitMethod('redoQuestions');">
+						<fmt:message key="label.redo" />
+					</html:button>
+				</c:if>						
+			</c:if>
+
 			<c:if test="${generalLearnerFlowDTO.reflection == 'true' }">					
 					<h2>
 							<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false" />						
 					</h2>
 
 					<c:out value="${QaLearningForm.entryText}" escapeXml="false" />
 
-					<c:if test="${generalLearnerFlowDTO.lockWhenFinished == 'true' }">										
-						<br>
-								<html:button property="forwardtoReflection" styleClass="button"
-									onclick="submitMethod('forwardtoReflection');"> 
-									<fmt:message key="label.edit" />
-								</html:button>
-					</c:if>													
+					<br>
+					<html:button property="forwardtoReflection" styleClass="button"
+						onclick="submitMethod('forwardtoReflection');"> 
+						<fmt:message key="label.edit" />
+					</html:button>
 			</c:if>													
 				
-				<c:if
-					test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
-					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
+			<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 
-						<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
-							<br>
-							<html:button property="redoQuestions" styleClass="button"
-								onclick="submitMethod('redoQuestions');">
-								<fmt:message key="label.redo" />
-							</html:button>
-						</c:if>						
-
-						<div class="space-bottom-top align-right">
-								<html:button property="endLearning" styleId="finishButton"
-									onclick="javascript:submitMethod('endLearning');"
-									styleClass="button">
-									<fmt:message key="button.endLearning" />
-								</html:button>
-						</div>
-					</c:if>
-				</c:if>
-				
-				<c:if
-					test="${generalLearnerFlowDTO.requestLearningReportViewOnly == 'true' }">
-					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
-
-						<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
-						<br>
-							<html:button property="redoQuestions" styleClass="button"
-								onclick="submitMethod('redoQuestions');">
-								<fmt:message key="label.redo" />
-							</html:button>
-						</c:if>						
-
-
-						<div class="space-bottom-top align-right" >
-								<html:button property="endLearning" styleId="finishButton"
-									onclick="javascript:submitMethod('endLearning');"
-									styleClass="button">
-									<fmt:message key="button.endLearning" />
-								</html:button>
-						</div>
-					</c:if>
-				</c:if>
-				
-				
+				<div class="space-bottom-top align-right">
+						<html:button property="endLearning" styleId="finishButton"
+							onclick="javascript:submitMethod('endLearning');"
+							styleClass="button">
+							<fmt:message key="button.endLearning" />
+						</html:button>
+				</div>
+			</c:if>
+						
 			</html:form>
 		</c:if>
 	</div>