Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6bcf712b3d8fe651de530f85975fcc536260d76f -rb0dcb38987a64f7df435ccf3e2beabe7ac54d8fb
--- lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6bcf712b3d8fe651de530f85975fcc536260d76f)
+++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b0dcb38987a64f7df435ccf3e2beabe7ac54d8fb)
@@ -82,6 +82,8 @@
 button.finish  =Next Activity
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
 message.contentInUseSet  =The modification of content is not allowed since one or more students has attempted the activity.
+message.warnLockOnFinish = Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes.
+message.activityLocked = The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more.
 
 
 #======= End labels: Exported 76 labels for en AU =====
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java
===================================================================
diff -u -rda54b82e5ef860fe9f8872b75f2b1718cfb7de32 -rb0dcb38987a64f7df435ccf3e2beabe7ac54d8fb
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	(.../NotebookDTO.java)	(revision da54b82e5ef860fe9f8872b75f2b1718cfb7de32)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	(.../NotebookDTO.java)	(revision b0dcb38987a64f7df435ccf3e2beabe7ac54d8fb)
@@ -55,6 +55,8 @@
 	
 	public boolean allowRichEditor;
 	
+	public boolean lockOnFinish;
+	
 	public Set<NotebookAttachmentDTO> onlineInstructionsFiles;
 
 	public Set<NotebookAttachmentDTO> offlineInstructionsFiles;
@@ -72,6 +74,7 @@
 		offlineInstructions = notebook.getOfflineInstructions();
 		contentInUse = notebook.isContentInUse();
 		allowRichEditor = notebook.isAllowRichEditor();
+		lockOnFinish = notebook.isLockOnFinished();
 
 		onlineInstructionsFiles = new TreeSet<NotebookAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<NotebookAttachmentDTO>();
@@ -182,4 +185,12 @@
 	public void setAllowRichEditor(boolean allowRichEditor) {
 		this.allowRichEditor = allowRichEditor;
 	}
+
+	public boolean isLockOnFinish() {
+		return lockOnFinish;
+	}
+
+	public void setLockOnFinish(boolean lockOnFinish) {
+		this.lockOnFinish = lockOnFinish;
+	}
 }
\ No newline at end of file
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java
===================================================================
diff -u -r9e446244a7245a4e8893e4673a801c56e4a35334 -rb0dcb38987a64f7df435ccf3e2beabe7ac54d8fb
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java	(.../NotebookUserDTO.java)	(revision 9e446244a7245a4e8893e4673a801c56e4a35334)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java	(.../NotebookUserDTO.java)	(revision b0dcb38987a64f7df435ccf3e2beabe7ac54d8fb)
@@ -38,6 +38,8 @@
 	
 	public String lastName;
 	
+	public boolean finishedActivity;
+	
 	public NotebookEntryDTO entryDTO;
 
 	public Long entryUID;
@@ -47,6 +49,7 @@
 		this.loginName = user.getLoginName();
 		this.firstName = user.getFirstName();
 		this.lastName = user.getLastName();
+		this.finishedActivity = user.isFinishedActivity();
 		this.entryUID = user.getEntryUID();
 		this.entryDTO = new NotebookEntryDTO(entry);
 	}
@@ -56,6 +59,7 @@
 		this.loginName = user.getLoginName();
 		this.firstName = user.getFirstName();
 		this.lastName = user.getLastName();
+		this.finishedActivity = user.isFinishedActivity();
 		this.entryUID = user.getEntryUID();		
 	}
 
@@ -116,4 +120,12 @@
 	public void setEntryUID(Long entryUID) {
 		this.entryUID = entryUID;
 	}
+
+	public boolean isFinishedActivity() {
+		return finishedActivity;
+	}
+
+	public void setFinishedActivity(boolean finishedActivity) {
+		this.finishedActivity = finishedActivity;
+	}
 }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
===================================================================
diff -u -rd702d483647b1a6f71b95add900b718fefc34cc3 -rb0dcb38987a64f7df435ccf3e2beabe7ac54d8fb
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	(.../LearningAction.java)	(revision d702d483647b1a6f71b95add900b718fefc34cc3)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	(.../LearningAction.java)	(revision b0dcb38987a64f7df435ccf3e2beabe7ac54d8fb)
@@ -40,6 +40,7 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.notebook.dto.NotebookDTO;
+import org.lamsfoundation.lams.tool.notebook.dto.NotebookUserDTO;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookSession;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
@@ -116,6 +117,7 @@
 		notebookDTO.title = notebook.getTitle();
 		notebookDTO.instructions = notebook.getInstructions();
 		notebookDTO.allowRichEditor = notebook.isAllowRichEditor();
+		notebookDTO.lockOnFinish = notebook.isLockOnFinished();
 		
 		request.setAttribute("notebookDTO", notebookDTO);
 
@@ -153,6 +155,7 @@
 		} else {
 			request.setAttribute("contentEditable", true);
 		}
+		request.setAttribute("finishedActivity", notebookUser.isFinishedActivity());
 
 		return mapping.findForward("notebook");
 	}
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r12bbe95c2b7f95369d2230ba30e842338e7c72a9 -rb0dcb38987a64f7df435ccf3e2beabe7ac54d8fb
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 12bbe95c2b7f95369d2230ba30e842338e7c72a9)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision b0dcb38987a64f7df435ccf3e2beabe7ac54d8fb)
@@ -1,41 +1,42 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script type="text/javascript">
-<!--	
+<!--
+	var mode = "${mode}";
+
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+
 	function validateForm() {
 	
 		// Validates that there's input from the user. 
 		
 		// disables the Finish button to avoid double submittion 
 		disableFinishButton();
 
- 	<c:if test='${mode == "learner"}'>
-		// if this is learner mode, then we add this validation see (LDEV-1319)
+ 		if (mode == "learner") {
+			// if this is learner mode, then we add this validation see (LDEV-1319)
 		
-		if (document.learningForm.entryText.value == "") {
-			
-			// if the input is blank, then we further inquire to make sure it is correct
-			if (confirm("\n<fmt:message>message.learner.blank.input</fmt:message>"))  {
-				// if correct, submit form
-				return true;
+			if (document.learningForm.entryText.value == "") {
+				
+				// if the input is blank, then we further inquire to make sure it is correct
+				if (confirm("<fmt:message>message.learner.blank.input</fmt:message>"))  {
+					// if correct, submit form
+					return true;
+				} else {
+					// otherwise, focus on the text area
+					document.learningForm.entryText.focus();
+					document.getElementById("finishButton").disabled = false;
+					return false;      
+				}
 			} else {
-				// otherwise, focus on the text area
-				document.learningForm.entryText.focus();
-				document.getElementById("finishButton").disabled = false;
-				return false;      
+				// there was something on the form, so submit the form
+				return true;
 			}
-		} else {
-			// there was something on the form, so submit the form
-			return true;
 		}
-		
-	</c:if>
-	
 	}
 
-	function disableFinishButton() {
-		document.getElementById("finishButton").disabled = true;
-	}
 -->
 </script>
 
@@ -44,15 +45,30 @@
 		${notebookDTO.title}
 	</h1>
 
-	
-	<html:form action="/learning" method="post" onsubmit="return validateForm();">
+	<p>
+		${notebookDTO.instructions}
+	</p>
+
+	<c:if test="${notebookDTO.lockOnFinish and mode == 'learner'}">
+		<div class="info">
+			<c:choose>
+				<c:when test="${finishedActivity}">
+					<fmt:message key="message.activityLocked" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="message.warnLockOnFinish" />
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
+
+	&nbsp;
+
+	<html:form action="/learning" method="post"
+		onsubmit="return validateForm();">
 		<html:hidden property="dispatch" value="finishActivity" />
 		<html:hidden property="toolSessionID" />
 
-		<p>
-			${notebookDTO.instructions}
-		</p>
-
 		<c:set var="lrnForm"
 			value="<%=request
 									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
@@ -81,8 +97,8 @@
 			</c:when>
 
 			<c:otherwise>
-					<lams:out value="${lrnForm.entryText}" />
-				</c:otherwise>
+				<lams:out value="${lrnForm.entryText}" />
+			</c:otherwise>
 		</c:choose>
 
 	</html:form>