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.5 -r1.6
--- lams_tool_notebook/web/pages/learning/notebook.jsp	3 Aug 2006 00:30:49 -0000	1.5
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	3 Aug 2006 07:14:11 -0000	1.6
@@ -17,28 +17,34 @@
 
 				<tr>
 					<td>
-
-
+						<c:set var="lrnForm"
+							value="<%=request
+											.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 						<c:choose>
-							<c:when test="${notebookDTO.allowRichEditor}">
-								<c:set var="lrnForm"
-									value="<%=request
-													.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+							<c:when test="${contentEditable}">
+								<c:choose>
+									<c:when test="${notebookDTO.allowRichEditor}">
 
-								<fck:editor id="entryText" basePath="/lams/fckeditor/"
-									imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-									linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-									flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-									imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-									linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-									flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
-									toolbarSet="Default-Learner">
-									${lrnForm.entryText}
-								</fck:editor>
+										<fck:editor id="entryText" basePath="/lams/fckeditor/"
+											imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+											linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+											flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+											imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+											linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+											flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+											toolbarSet="Default-Learner">
+												${lrnForm.entryText}
+										</fck:editor>
+									</c:when>
+
+									<c:otherwise>
+										<html:textarea cols="66" rows="8" property="entryText"></html:textarea>
+									</c:otherwise>
+								</c:choose>
 							</c:when>
 
 							<c:otherwise>
-								<html:textarea cols="66" rows="8" property="entryText"></html:textarea>
+								${lrnForm.entryText}
 							</c:otherwise>
 						</c:choose>
 					</td>