Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.8 -r1.9
--- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	1 Oct 2008 03:53:24 -0000	1.8
+++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	1 Oct 2008 04:10:18 -0000	1.9
@@ -18,7 +18,6 @@
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
 advanced.lockOnFinished  =Lock when finished
-advanced.allowRichEditor  =Allow rich text editor
 advanced.reflectOnActivity = Add Notebook at end of Dimdim with the following instructions:
 instructions.type.online  =Online
 instructions.type.offline  =Offline
@@ -91,7 +90,7 @@
 monitor.summary.th.advancedSettings  =Advanced Settings
 
 label.authoring.basic.dimdimSettings = Dimdim Settings
-label.authoring.basic.maxAttendeeMikes  = Attendee Mikes
+label.authoring.basic.maxAttendeeMikes  = Number of microphones allowed
 
 admin.title = Dim Dim Administration
 admin.dimdimServerURL = Dim Dim Server URL
Index: lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql,v
diff -u -r1.6 -r1.7
--- lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql	1 Oct 2008 03:53:24 -0000	1.6
+++ lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql	1 Oct 2008 04:10:18 -0000	1.7
@@ -10,7 +10,7 @@
 drop table if exists tl_laddim10_session;
 drop table if exists tl_laddim10_user;
 create table tl_laddim10_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, dimdim_uid bigint, primary key (uid));
-create table tl_laddim10_dimdim (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, reflect_on_activity bit, reflect_instructions text, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, max_attendee_mikes integer, primary key (uid));
+create table tl_laddim10_dimdim (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, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, max_attendee_mikes integer, primary key (uid));
 create table tl_laddim10_dimdim_config (uid bigint not null auto_increment, config_key varchar(255), config_value varchar(255), primary key (uid));
 create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, meeting_key varchar(255), max_attendee_mikes integer, primary key (uid));
 create table tl_laddim10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, dimdim_session_uid bigint, notebook_entry_uid bigint, primary key (uid));
@@ -39,7 +39,6 @@
 	lock_on_finished,
 	content_in_use,
 	define_later,
-	allow_rich_editor,
 	reflect_on_activity
 	)
 VALUES(
@@ -52,7 +51,6 @@
 	0,
 	0,
 	0,
-	0,
 	0
 );
 
Index: lams_tool_dimdim/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/db/sql/Attic/table-schema.sql,v
diff -u -r1.6 -r1.7
--- lams_tool_dimdim/db/sql/table-schema.sql	1 Oct 2008 03:53:24 -0000	1.6
+++ lams_tool_dimdim/db/sql/table-schema.sql	1 Oct 2008 04:10:18 -0000	1.7
@@ -7,7 +7,7 @@
 drop table if exists tl_laddim10_session;
 drop table if exists tl_laddim10_user;
 create table tl_laddim10_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, dimdim_uid bigint, primary key (uid));
-create table tl_laddim10_dimdim (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, reflect_on_activity bit, reflect_instructions text, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, max_attendee_mikes integer, primary key (uid));
+create table tl_laddim10_dimdim (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, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, max_attendee_mikes integer, primary key (uid));
 create table tl_laddim10_dimdim_config (uid bigint not null auto_increment, config_key varchar(255), config_value varchar(255), primary key (uid));
 create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, meeting_key varchar(255), max_attendee_mikes integer, primary key (uid));
 create table tl_laddim10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, dimdim_session_uid bigint, notebook_entry_uid bigint, primary key (uid));
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/ContentDTO.java,v
diff -u -r1.8 -r1.9
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java	1 Oct 2008 03:53:24 -0000	1.8
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java	1 Oct 2008 04:10:18 -0000	1.9
@@ -55,8 +55,6 @@
 
     public boolean contentInUse;
 
-    public boolean allowRichEditor;
-
     public boolean lockOnFinish;
 
     public Set<AttachmentDTO> onlineInstructionsFiles;
@@ -82,7 +80,6 @@
 	this.contentInUse = dimdim.isContentInUse();
 	this.reflectInstructions = dimdim.getReflectInstructions();
 	this.reflectOnActivity = dimdim.isReflectOnActivity();
-	this.allowRichEditor = dimdim.isAllowRichEditor();
 	this.lockOnFinish = dimdim.isLockOnFinished();
 
 	this.onlineInstructionsFiles = new TreeSet<AttachmentDTO>();
@@ -199,14 +196,6 @@
 	this.contentInUse = contentInUse;
     }
 
-    public boolean isAllowRichEditor() {
-	return allowRichEditor;
-    }
-
-    public void setAllowRichEditor(boolean allowRichEditor) {
-	this.allowRichEditor = allowRichEditor;
-    }
-
     public boolean isLockOnFinish() {
 	return lockOnFinish;
     }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/Dimdim.java,v
diff -u -r1.7 -r1.8
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java	1 Oct 2008 03:53:24 -0000	1.7
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java	1 Oct 2008 04:10:18 -0000	1.8
@@ -67,8 +67,6 @@
 
     private String reflectInstructions;
 
-    private boolean allowRichEditor;
-
     private String onlineInstructions;
 
     private String offlineInstructions;
@@ -241,18 +239,6 @@
     }
 
     /**
-     * @hibernate.property column="allow_rich_editor" length="1"
-     * @return
-     */
-    public boolean isAllowRichEditor() {
-	return allowRichEditor;
-    }
-
-    public void setAllowRichEditor(boolean allowRichEditor) {
-	this.allowRichEditor = allowRichEditor;
-    }
-
-    /**
      * @hibernate.property column="online_instructions" length="65535"
      * 
      */
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java,v
diff -u -r1.9 -r1.10
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	1 Oct 2008 03:53:24 -0000	1.9
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	1 Oct 2008 04:10:18 -0000	1.10
@@ -619,7 +619,6 @@
 	dimdim.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 	dimdim.setToolContentId(toolContentId);
 	dimdim.setUpdateDate(now);
-	dimdim.setAllowRichEditor(Boolean.FALSE);
 	// leave as empty, no need to set them to anything.
 	// setDimdimAttachments(Set dimdimAttachments);
 	// setDimdimSessions(Set dimdimSessions);
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java	1 Oct 2008 03:53:24 -0000	1.7
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java	1 Oct 2008 04:10:18 -0000	1.8
@@ -348,7 +348,6 @@
 	    dimdim.setReflectOnActivity(authForm.isReflectOnActivity());
 	    dimdim.setReflectInstructions(authForm.getReflectInstructions());
 	    dimdim.setLockOnFinished(authForm.isLockOnFinished());
-	    dimdim.setAllowRichEditor(authForm.isAllowRichEditor());
 
 	    // TODO check whether these fields should be in here
 	    dimdim.setMaxAttendeeMikes(authForm.getMaxAttendeeMikes());
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	1 Oct 2008 03:53:24 -0000	1.9
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	1 Oct 2008 04:10:18 -0000	1.10
@@ -113,7 +113,6 @@
 	ContentDTO contentDTO = new ContentDTO();
 	contentDTO.title = dimdim.getTitle();
 	contentDTO.instructions = dimdim.getInstructions();
-	contentDTO.allowRichEditor = dimdim.isAllowRichEditor();
 	contentDTO.lockOnFinish = dimdim.isLockOnFinished();
 	contentDTO.reflectOnActivity = dimdim.isReflectOnActivity();
 	contentDTO.reflectInstructions = dimdim.getReflectInstructions();
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/Attic/AuthoringForm.java,v
diff -u -r1.7 -r1.8
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java	1 Oct 2008 03:53:24 -0000	1.7
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java	1 Oct 2008 04:10:18 -0000	1.8
@@ -57,8 +57,6 @@
 
     private String reflectInstructions;
 
-    private boolean allowRichEditor;
-
     private FormFile onlineFile;
 
     private FormFile offlineFile;
@@ -195,14 +193,6 @@
 	this.deleteFileUuid = deleteFile;
     }
 
-    public boolean isAllowRichEditor() {
-	return allowRichEditor;
-    }
-
-    public void setAllowRichEditor(boolean allowRichEditor) {
-	this.allowRichEditor = allowRichEditor;
-    }
-
     public Integer getMaxAttendeeMikes() {
 	return maxAttendeeMikes;
     }
Index: lams_tool_dimdim/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/authoring/Attic/advanced.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/web/pages/authoring/advanced.jsp	1 Oct 2008 02:59:36 -0000	1.2
+++ lams_tool_dimdim/web/pages/authoring/advanced.jsp	1 Oct 2008 04:10:18 -0000	1.3
@@ -11,14 +11,6 @@
 </p>
 
 <p>
-	<html:checkbox property="allowRichEditor" value="1"
-		styleClass="noBorder" styleId="allowRichEditor"></html:checkbox>
-	<label for="allowRichEditor">
-		<fmt:message key="advanced.allowRichEditor" />
-	</label>
-</p>
-
-<p>
 	<html:checkbox property="reflectOnActivity" value="1"
 		styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
 
Index: lams_tool_dimdim/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/monitoring/Attic/summary.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_dimdim/web/pages/monitoring/summary.jsp	1 Oct 2008 03:53:24 -0000	1.8
+++ lams_tool_dimdim/web/pages/monitoring/summary.jsp	1 Oct 2008 04:10:18 -0000	1.9
@@ -45,22 +45,6 @@
 			</td>
 		</tr>
 
-		<tr>
-			<td>
-				<fmt:message key="advanced.allowRichEditor" />
-			</td>
-
-			<td>
-				<c:choose>
-					<c:when test="${dto.allowRichEditor}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>
-			</td>
-		</tr>
 	</table>
 </div>