Index: lams_tool_chat/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.22 -r1.23
--- lams_tool_chat/conf/language/ApplicationResources.properties	3 Nov 2006 05:17:20 -0000	1.22
+++ lams_tool_chat/conf/language/ApplicationResources.properties	21 Nov 2006 05:16:49 -0000	1.23
@@ -88,5 +88,7 @@
 button.reflect  =Reflect on chat
 button.continue  =Continue
 
-
 #======= End labels: Exported 81 labels for en AU =====
+
+button.edit =Edit
+message.no.reflection.available = No notebook available
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java,v
diff -u -r1.20 -r1.21
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java	1 Nov 2006 23:46:48 -0000	1.20
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java	21 Nov 2006 05:16:49 -0000	1.21
@@ -222,6 +222,17 @@
 		ChatDTO chatDTO = new ChatDTO(chatUser.getChatSession().getChat());
 
 		request.setAttribute("chatDTO", chatDTO);
+		
+		NotebookEntry notebookEntry = chatService.getEntry(
+				chatUser.getChatSession().getSessionId(),
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				ChatConstants.TOOL_SIGNATURE,
+				chatUser.getUserId().intValue());
+		
+		if (notebookEntry != null) {
+			lrnForm.setEntryText(notebookEntry.getEntry());
+		}
+		
 		return mapping.findForward("notebook");
 	}
 
Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/parts/finishButton.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	16 Nov 2006 07:58:04 -0000	1.6
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	21 Nov 2006 05:16:48 -0000	1.7
@@ -1,16 +1,34 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:if
-	test="${chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
-	<div class="space-top">
-		<h4>
-			${chatDTO.reflectInstructions}
-		</h4>
-		<p>
-			${chatUserDTO.notebookEntry}
-		</p>
-	</div>
-</c:if>
+<html:form action="/learning" method="post">
+	<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
+	<html:hidden property="dispatch" value="openNotebook" />
+	
+	<c:if
+		test="${chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
+		<div class="space-top">
+			<h2>
+				${chatDTO.reflectInstructions}
+			</h2>
+			
+			<p>
+				<c:choose>
+					<c:when test="${not empty chatUserDTO.notebookEntry}">
+						<lams:out value="${chatUserDTO.notebookEntry}" escapeXml="true" />
+					</c:when>
+					
+					<c:otherwise>
+						<em><fmt:message key="message.no.reflection.available" /></em>  
+					</c:otherwise>
+				</c:choose>		
+			</p>
+			
+			<html:submit styleClass="button">
+				<fmt:message key="button.edit" />
+			</html:submit>
+		</div>
+	</c:if>
+</html:form>
 
 <html:form action="/learning" method="post">
 	<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
@@ -23,7 +41,6 @@
 				<html:submit styleClass="button">
 					<fmt:message key="button.continue" />
 				</html:submit>
-
 			</c:when>
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />