Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Attic/Notebook.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml	27 Jul 2006 06:06:46 -0000	1.2
@@ -87,6 +87,15 @@
         />
 
         <property
+            name="allowRichEditor"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="allow_rich_editor"
+            length="1"
+        />
+
+        <property
             name="onlineInstructions"
             type="java.lang.String"
             update="true"
Index: lams_tool_notebook/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/conf/language/ApplicationResources.properties	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/conf/language/ApplicationResources.properties	27 Jul 2006 06:06:46 -0000	1.2
@@ -22,10 +22,11 @@
 # Basic Page
 label.authoring.basic.title=Title:
 label.authoring.basic.content=Content:
-label.authoring.basic.instructions=Intructions:
+label.authoring.basic.instructions=Instructions:
 
 #Advanced Page
-advanced.lockOnFinished= Lock on Finish
+advanced.lockOnFinished= Lock when finished
+advanced.allowRichEditor= Allow rich text editor
 advanced.filteringEnabled= Filter Messages
 
 #Instructions Page
Index: lams_tool_notebook/db/sql/create_lams_tool_notebook.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/create_lams_tool_notebook.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/db/sql/create_lams_tool_notebook.sql	25 Jul 2006 07:15:35 -0000	1.3
+++ lams_tool_notebook/db/sql/create_lams_tool_notebook.sql	27 Jul 2006 06:06:45 -0000	1.4
@@ -6,14 +6,14 @@
 drop table if exists tl_lantbk11_session;
 drop table if exists tl_lantbk11_user;
 create table tl_lantbk11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, notebook_uid bigint, primary key (uid));
-create table tl_lantbk11_notebook (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
+create table tl_lantbk11_notebook (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
 create table tl_lantbk11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), notebook_uid bigint, primary key (uid));
 create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, entry_uid bigint, primary key (uid));
 alter table tl_lantbk11_attachment add index FK12090F57FC940906 (notebook_uid), add constraint FK12090F57FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
 alter table tl_lantbk11_session add index FKB7C198E2FC940906 (notebook_uid), add constraint FKB7C198E2FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
 alter table tl_lantbk11_user add index FKCB8A58FFA3B0FADF (notebook_session_uid), add constraint FKCB8A58FFA3B0FADF foreign key (notebook_session_uid) references tl_lantbk11_session (uid);
 
-INSERT INTO tl_lantbk11_notebook (title,instructions,online_instructions,offline_instructions,tool_content_id,run_offline,lock_on_finished,content_in_use,define_later) 
-VALUES("LAMS Notebook","Notebook Instruction","Online instructions","Offline instructions",${default_content_id},0,0,0,0);
+INSERT INTO tl_lantbk11_notebook (title,instructions,online_instructions,offline_instructions,tool_content_id,run_offline,lock_on_finished,content_in_use,define_later, allow_rich_editor) 
+VALUES("LAMS Notebook","Notebook Instruction","Online instructions","Offline instructions",${default_content_id},0,0,0,0,0);
 
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_notebook/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/table-schema.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/db/sql/table-schema.sql	25 Jul 2006 07:15:35 -0000	1.3
+++ lams_tool_notebook/db/sql/table-schema.sql	27 Jul 2006 06:06:45 -0000	1.4
@@ -6,7 +6,7 @@
 drop table if exists tl_lantbk11_session;
 drop table if exists tl_lantbk11_user;
 create table tl_lantbk11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, notebook_uid bigint, primary key (uid));
-create table tl_lantbk11_notebook (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
+create table tl_lantbk11_notebook (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
 create table tl_lantbk11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), notebook_uid bigint, primary key (uid));
 create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, entry_uid bigint, primary key (uid));
 alter table tl_lantbk11_attachment add index FK12090F57FC940906 (notebook_uid), add constraint FK12090F57FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	25 Jul 2006 07:15:35 -0000	1.2
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	27 Jul 2006 06:06:46 -0000	1.3
@@ -54,6 +54,8 @@
 	
 	public boolean contentInUse;
 	
+	public boolean allowRichEditor;
+	
 	public Set<NotebookAttachmentDTO> onlineInstructionsFiles;
 
 	public Set<NotebookAttachmentDTO> offlineInstructionsFiles;
@@ -72,6 +74,7 @@
 		onlineInstructions = notebook.getOnlineInstructions();
 		offlineInstructions = notebook.getOfflineInstructions();
 		contentInUse = notebook.getContentInUse();
+		allowRichEditor = notebook.getAllowRichEditor();
 
 		onlineInstructionsFiles = new TreeSet<NotebookAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<NotebookAttachmentDTO>();
@@ -176,4 +179,12 @@
 	public void setContentInUse(Boolean contentInUse) {
 		this.contentInUse = contentInUse;
 	}
+
+	public boolean isAllowRichEditor() {
+		return allowRichEditor;
+	}
+
+	public void setAllowRichEditor(boolean allowRichEditor) {
+		this.allowRichEditor = allowRichEditor;
+	}
 }
\ No newline at end of file
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java	20 Jul 2006 05:41:21 -0000	1.2
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java	27 Jul 2006 06:06:46 -0000	1.3
@@ -68,6 +68,8 @@
 	private Boolean runOffline;
 
 	private Boolean lockOnFinished;
+	
+	private Boolean allowRichEditor;
 
 	private String onlineInstructions;
 
@@ -219,7 +221,19 @@
 	public void setLockOnFinished(Boolean lockOnFinished) {
 		this.lockOnFinished = lockOnFinished;
 	}
+	
+	/**
+	 * @hibernate.property column="allow_rich_editor" length="1"
+	 * @return
+	 */
+	public Boolean getAllowRichEditor() {
+		return allowRichEditor;
+	}
 
+	public void setAllowRichEditor(Boolean allowRichEditor) {
+		this.allowRichEditor = allowRichEditor;
+	}
+
 	/**
 	 * @hibernate.property column="online_instructions" length="65535"
 	 * 
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	20 Jul 2006 05:41:21 -0000	1.2
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	27 Jul 2006 06:06:46 -0000	1.3
@@ -353,6 +353,7 @@
 		notebook.setOfflineInstructions(authForm.getOnlineInstruction());
 		notebook.setOnlineInstructions(authForm.getOfflineInstruction());
 		notebook.setLockOnFinished(authForm.isLockOnFinished());
+		notebook.setAllowRichEditor(authForm.isAllowRichEditor());
 	}
 
 	/**
@@ -369,6 +370,7 @@
 		authForm.setOnlineInstruction(notebook.getOnlineInstructions());
 		authForm.setOfflineInstruction(notebook.getOfflineInstructions());
 		authForm.setLockOnFinished(notebook.getLockOnFinished());
+		authForm.setAllowRichEditor(notebook.getAllowRichEditor());
 	}
 
 	/**
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.3 -r1.4
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	25 Jul 2006 07:15:35 -0000	1.3
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	27 Jul 2006 06:06:46 -0000	1.4
@@ -114,6 +114,8 @@
 		NotebookDTO notebookDTO = new NotebookDTO();
 		notebookDTO.title = notebook.getTitle();
 		notebookDTO.instructions = notebook.getInstructions();
+		notebookDTO.allowRichEditor = notebook.getAllowRichEditor();
+		
 		request.setAttribute("notebookDTO", notebookDTO);
 
 		// Set the content in use flag.
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/AuthoringForm.java	27 Jul 2006 06:06:46 -0000	1.2
@@ -56,6 +56,8 @@
 
 	boolean lockOnFinished;
 	
+	boolean allowRichEditor;
+	
 	FormFile onlineFile; 
 
 	FormFile offlineFile;
@@ -182,4 +184,12 @@
 	public void setDeleteFileUuid(Long deleteFile) {
 		this.deleteFileUuid = deleteFile;
 	}
+
+	public boolean isAllowRichEditor() {
+		return allowRichEditor;
+	}
+
+	public void setAllowRichEditor(boolean allowRichEditor) {
+		this.allowRichEditor = allowRichEditor;
+	}
 }
Index: lams_tool_notebook/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/advanced.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/authoring/advanced.jsp	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/web/pages/authoring/advanced.jsp	27 Jul 2006 06:06:46 -0000	1.2
@@ -10,6 +10,11 @@
 				<html:checkbox property="lockOnFinished" value="1" styleClass="noBorder"><fmt:message key="advanced.lockOnFinished" /></html:checkbox>
 			</td>
 		</tr>
+		<tr>
+			<td >
+				<html:checkbox property="allowRichEditor" value="1" styleClass="noBorder"><fmt:message key="advanced.allowRichEditor" /></html:checkbox>
+			</td>
+		</tr>
 	</tbody>
 </table>
 
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.2 -r1.3
--- lams_tool_notebook/web/pages/learning/notebook.jsp	25 Jul 2006 07:15:33 -0000	1.2
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	27 Jul 2006 06:06:45 -0000	1.3
@@ -14,35 +14,31 @@
 						${notebookDTO.instructions}
 					</td>
 				</tr>
-				
-				<c:if test="${not contentEditable}">
-					<tr>
-						<td>
-							
-						</td>
-					</tr>
-				</c:if>
 
-
 				<tr>
 					<td>
-						<div>
-							<html:textarea property="entryText" readonly="${not contentEditable}" rows="5" cols="66"></html:textarea>
-						</div>
+						<c:set var="lrnForm" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+						<lams:SetEditor id="entryText" text="${lrnForm.entryText}" />
+						
+						=== ${lrnForm.entryText} ===
 					</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>
 <div id="footer-learner"></div>
+
+<lams:HTMLEditor />