Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	1 Nov 2006 23:51:33 -0000	1.7
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	23 Nov 2006 06:00:19 -0000	1.8
@@ -129,9 +129,15 @@
 		if (notebook.isRunOffline()) {
 			return mapping.findForward("runOffline");
 		}
-
-		NotebookUser notebookUser = getCurrentUser(toolSessionID);
 		
+		NotebookUser notebookUser;
+		if (mode.equals(ToolAccessMode.TEACHER)) {
+			Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
+			notebookUser = notebookService.getUserByUserIdAndSessionId(userID, toolSessionID);
+		} else {
+			notebookUser = getCurrentUser(toolSessionID);
+		}
+		
 		// get any existing notebook entry
 		NotebookEntry nbEntry = notebookService.getEntry(notebookUser
 				.getEntryUID());
@@ -140,7 +146,7 @@
 		}
 		
 		// set readOnly flag.
-		if (notebook.isLockOnFinished() && notebookUser.isFinishedActivity()) {
+		if (mode.equals(ToolAccessMode.TEACHER) || (notebook.isLockOnFinished() && notebookUser.isFinishedActivity())) {
 			request.setAttribute("contentEditable", false);
 		} else {
 			request.setAttribute("contentEditable", true);
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_notebook/web/pages/learning/notebook.jsp	16 Nov 2006 07:56:26 -0000	1.12
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	23 Nov 2006 06:00:18 -0000	1.13
@@ -5,45 +5,43 @@
 		${notebookDTO.title}
 	</h1>
 
-	<c:if test="${mode == 'learner' || mode == 'author'}">
-	
-		<html:form action="/learning" method="post">
-			<html:hidden property="dispatch" value="finishActivity" />
-			<html:hidden property="toolSessionID" />
+	<html:form action="/learning" method="post">
+		<html:hidden property="dispatch" value="finishActivity" />
+		<html:hidden property="toolSessionID" />
 
-			<p>
-				${notebookDTO.instructions}
-			</p>
+		<p>
+			${notebookDTO.instructions}
+		</p>
 
-			<c:set var="lrnForm"
-				value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				
-			<c:choose>
-				<c:when test="${contentEditable}">
-					<c:choose>
-						<c:when test="${notebookDTO.allowRichEditor}">
-							<lams:FCKEditor id="entryText" value="${lrnForm.entryText}"
-								toolbarSet="Default-Learner">
-							</lams:FCKEditor>
-						</c:when>
+		<c:set var="lrnForm"
+			value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-						<c:otherwise>
-							<html:textarea cols="60" rows="8" property="entryText"
-								styleClass="text-area"></html:textarea>
-						</c:otherwise>
-					</c:choose>
-				</c:when>
+		<c:choose>
+			<c:when test="${contentEditable}">
+				<c:choose>
+					<c:when test="${notebookDTO.allowRichEditor}">
+						<lams:FCKEditor id="entryText" value="${lrnForm.entryText}"
+							toolbarSet="Default-Learner">
+						</lams:FCKEditor>
+					</c:when>
 
-				<c:otherwise>
-					${lrnForm.entryText}
+					<c:otherwise>
+						<html:textarea cols="60" rows="8" property="entryText"
+							styleClass="text-area"></html:textarea>
+					</c:otherwise>
+				</c:choose>
+			</c:when>
+
+			<c:otherwise>
+					<lams:out value="${lrnForm.entryText}" />
 				</c:otherwise>
-			</c:choose>
+		</c:choose>
 
-			<div class="space-bottom-top align-right">
-					<html:submit styleClass="button">
-						<fmt:message>button.finish</fmt:message>
-					</html:submit>
-			</div>
-		</html:form>
-	</c:if>
+		<div class="space-bottom-top align-right">
+			<html:submit styleClass="button">
+				<fmt:message>button.finish</fmt:message>
+			</html:submit>
+		</div>
+	</html:form>
 </div>