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>