Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	23 Nov 2006 07:07:36 -0000	1.4
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	26 Nov 2006 22:25:36 -0000	1.5
@@ -157,20 +157,28 @@
 
 				</c:if>				
 
-				<c:if
-					test="${generalLearnerFlowDTO.notebookEntry != null && generalLearnerFlowDTO.notebookEntry != ''}">
+
 					<h2>
-						<fmt:message key="label.notebook.entries" />
+							<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false" />												
 					</h2>
-					<c:out value="${generalLearnerFlowDTO.notebookEntry}"
-						escapeXml="false" />
-				</c:if>
 
+					<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>													
+
+
 				<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" />
@@ -207,7 +215,6 @@
 		</c:if>
 
 
-
 		<c:if
 			test="${generalLearnerFlowDTO.requestLearningReportProgress == 'true'}">
 
@@ -304,23 +311,27 @@
 					</c:forEach>
 				</c:if>				
 
-				<c:if
-					test="${generalLearnerFlowDTO.notebookEntry != null && generalLearnerFlowDTO.notebookEntry != ''}">
 					<h2>
-						<fmt:message key="label.notebook.entries" />
+							<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false" />						
 					</h2>
-					<p>
-						<c:out value="${generalLearnerFlowDTO.notebookEntry}"
-							escapeXml="false" />
-					</p>
-				</c:if>
 
+					<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>													
+
 				
 				<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" />
@@ -342,6 +353,7 @@
 					<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" />