Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r1d4d39bc99bceeb2f3400228a83823b8cd67c6da -r33b14e73e74128434eb756d14d92f5281b55cf45
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 1d4d39bc99bceeb2f3400228a83823b8cd67c6da)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 33b14e73e74128434eb756d14d92f5281b55cf45)
@@ -17,25 +17,43 @@
 
 				<tr>
 					<td>
-						<c:set var="lrnForm" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-						<lams:SetEditor id="entryText" text="${lrnForm.entryText}" />
-						
-						=== ${lrnForm.entryText} ===
+
+
+						<c:choose>
+							<c:when test="${notebookDTO.allowRichEditor}">
+								<c:set var="lrnForm"
+									value="<%=request
+													.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+
+								<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>
 					</td>
 				</tr>
-				
-				 
-				
+
 				<tr>
-						<td class="right-buttons">
-							<html:hidden property="dispatch" value="finishActivity" />
-							<html:hidden property="toolSessionID" />
-							<html:submit styleClass="button">
-								<fmt:message>button.finish</fmt:message>
-							</html:submit>
-						</td>
-					</tr>
-				</table>
+					<td class="right-buttons">
+						<html:hidden property="dispatch" value="finishActivity" />
+						<html:hidden property="toolSessionID" />
+						<html:submit styleClass="button">
+							<fmt:message>button.finish</fmt:message>
+						</html:submit>
+					</td>
+				</tr>
+			</table>
 		</html:form>
 	</c:if>
 </div>