Index: lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql	19 Feb 2009 05:39:09 -0000	1.3
+++ lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql	19 Feb 2009 23:26:32 -0000	1.4
@@ -28,6 +28,8 @@
 	create_by bigint,
 	title varchar(255),
 	instructions text,
+	reflect_on_activity bit,
+	reflect_instructions text,
 	run_offline bit,
 	lock_on_finished bit,
 	online_instructions text,
@@ -111,6 +113,8 @@
 	instructions,
 	online_instructions,
 	offline_instructions,
+	reflect_on_activity, 
+	reflect_instructions,
 	tool_content_id,
 	run_offline,
 	lock_on_finished,
@@ -129,6 +133,8 @@
 	"Instructions",
 	"",
 	"",
+	0,
+	"",
 	${default_content_id},
 	0,
 	0,
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java	19 Feb 2009 05:39:09 -0000	1.3
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java	19 Feb 2009 23:26:32 -0000	1.4
@@ -49,6 +49,10 @@
 
 	public String offlineInstructions;
 	
+	public boolean reflectOnActivity;
+	
+	public String reflectInstructions;
+	
 	public boolean defineLater;
 	
 	public boolean contentInUse;
@@ -95,6 +99,8 @@
 		allowRatings = videoRecorder.isAllowRatings();
 		exportAll = videoRecorder.isExportAll();
 		exportOffline = videoRecorder.isExportOffline();
+		reflectOnActivity = videoRecorder.isReflectOnActivity();
+		reflectInstructions = videoRecorder.getReflectInstructions();
 
 		onlineInstructionsFiles = new TreeSet<VideoRecorderAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<VideoRecorderAttachmentDTO>();
@@ -174,6 +180,22 @@
 		this.onlineInstructionsFiles = onlineInstructionsFiles;
 	}
 
+	public boolean isReflectOnActivity() {
+		return reflectOnActivity;
+	}
+
+	public void setReflectOnActivity(boolean reflectOnActivity) {
+		this.reflectOnActivity = reflectOnActivity;
+	}
+
+	public String getReflectInstructions() {
+		return reflectInstructions;
+	}
+
+	public void setReflectInstructions(String reflectInstructions) {
+		this.reflectInstructions = reflectInstructions;
+	}
+	
 	public String getTitle() {
 		return title;
 	}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java,v
diff -u -r1.3 -r1.4
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java	19 Feb 2009 05:39:07 -0000	1.3
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java	19 Feb 2009 23:26:32 -0000	1.4
@@ -63,6 +63,10 @@
     private String title;
 
     private String instructions;
+    
+	boolean reflectOnActivity;
+	
+	String reflectInstructions;
 
     private boolean runOffline;
 
@@ -113,7 +117,7 @@
 	    String onlineInstructions, String offlineInstructions, boolean contentInUse, boolean defineLater,
 	    boolean allowUseVoice, boolean allowUseCamera, boolean allowLearnerVideoExport, boolean allowLearnerVideoVisibility,
 	    Long toolContentId, Set videoRecorderAttachments, Set videoRecorderSessions, boolean exportAll,
-	    boolean exportOffline) {
+	    boolean exportOffline, boolean reflectOnActivity, String reflectInstructions) {
 	this.createDate = createDate;
 	this.updateDate = updateDate;
 	this.createBy = createBy;
@@ -133,6 +137,8 @@
 	this.allowLearnerVideoVisibility = allowLearnerVideoVisibility;
 	this.exportOffline = exportOffline;
 	this.exportAll = exportAll;
+	this.reflectOnActivity = reflectOnActivity;
+	this.reflectInstructions = reflectInstructions;
     }
 
     // Property accessors
@@ -214,6 +220,28 @@
 	this.instructions = instructions;
     }
 
+	/**
+	 * @hibernate.property column="reflect_on_activity" length="1"
+	 */
+	public boolean isReflectOnActivity() {
+		return reflectOnActivity;
+	}
+
+	public void setReflectOnActivity(boolean reflectOnActivity) {
+		this.reflectOnActivity = reflectOnActivity;
+	}
+
+	/**
+	 * @hibernate.property column="reflect_instructions" length="65535"
+	 */
+	public String getReflectInstructions() {
+		return reflectInstructions;
+	}
+
+	public void setReflectInstructions(String reflectInstructions) {
+		this.reflectInstructions = reflectInstructions;
+	}    
+    
     /**
      * @hibernate.property column="run_offline" length="1"
      * 
Index: lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp	19 Feb 2009 05:39:08 -0000	1.3
+++ lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp	19 Feb 2009 23:26:32 -0000	1.4
@@ -73,13 +73,6 @@
 	</c:if>
 
 	&nbsp;
-
-	<html:form action="/learning" method="post"
-		onsubmit="return validateForm();">
-		<html:hidden property="dispatch" value="finishActivity" />
-		<html:hidden property="toolSessionID" />
-
-	</html:form>
 	
 	<div id="videoRecorder">
 		<script language="JavaScript" type="text/javascript">
@@ -158,24 +151,7 @@
 		</noscript>
 	</div>
 	
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningForm">
-		<html:hidden property="dispatch" styleId = "dispatch" value="finishActivity" />
-		<html:hidden property="toolSessionID" styleId="toolSessionID"/>
-		<html:hidden property="mode" value="${mode}" />	
-		<div class="space-bottom-top align-right">
-			<c:choose>
-				<c:when test="${!videoRecorderUserDTO.finishedActivity}">
-					<html:submit styleClass="button" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity';">
-						<fmt:message key="button.continue" />
-					</html:submit>
-				</c:when>
-					<c:otherwise>
-					<html:hidden property="dispatch" value="finishActivity" />
-					<html:submit styleClass="button" styleId="finishButton" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity';">
-						<fmt:message key="button.finish" />
-					</html:submit>
-				</c:otherwise>
-			</c:choose>
-		</div>
-	</html:form>
+	<c:if test="${mode == 'learner' || mode == 'author'}">
+		<%@ include file="parts/finishButton.jsp"%>
+	</c:if>
 </div>
Index: lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp	19 Feb 2009 23:26:32 -0000	1.1
@@ -0,0 +1,64 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<html:form action="/learning" method="post">
+	<html:hidden property="videoRecorderUserUID" value="${videoRecorderUserDTO.uid}" />
+	<html:hidden property="dispatch" value="openNotebook" />
+
+	<c:if
+		test="${videoRecorderUserDTO.finishedActivity and videoRecorderDTO.reflectOnActivity}">
+		<div class="space-top">
+			<h2>
+				${videoRecorderDTO.reflectInstructions}
+			</h2>
+
+			<p>
+				<c:choose>
+					<c:when test="${not empty videoRecorderDTO.notebookEntry}">
+						<lams:out escapeHtml="true" value="${videoRecorderUserDTO.notebookEntry}" />
+					</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>
+
+<script type="text/javascript">
+	function disableFinishButton() {
+		var finishButton = document.getElementById("finishButton");
+		if (finishButton != null) {
+			finishButton.disabled = true;
+		}
+	}
+</script>
+
+<html:form action="/learning" method="post"
+	onsubmit="disableFinishButton();">
+	<html:hidden property="videoRecorderUserUID" value="${videoRecorderUserDTO.uid}" />
+	<html:hidden property="toolSessionID" value="${toolSessionId}" />
+	<div class="space-bottom-top align-right">
+		<c:choose>
+			<c:when
+				test="${!videoRecorderUserDTO.finishedActivity and videoRecorderDTO.reflectOnActivity}">
+				<html:hidden property="dispatch" value="openNotebook" />
+
+				<html:submit styleClass="button">
+					<fmt:message key="button.continue" />
+				</html:submit>
+			</c:when>
+			<c:otherwise>
+				<html:hidden property="dispatch" value="finishActivity" />
+				<html:submit styleClass="button" styleId="finishButton">
+					<fmt:message key="button.finish" />
+				</html:submit>
+			</c:otherwise>
+		</c:choose>
+	</div>
+</html:form>