Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r16be4f178e2ed2998569f494ebe63cf5066836a6 -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -66,11 +66,10 @@
 message.msg.maxFileSize  =Max 250K
 title.messageTopic.open  =Topic Details
 title.message.add  =Add Message
-title.message.open  =View Message
 title.message.reply  =Reply Message
-title.message.edit  =Edit Message
+title.wiki.edit  =Edit Wiki
 title.message.view  =Message Board
-title.message.view.topic  =View Message
+title.wiki.view.topic  =View Wiki
 title.message.delete  =Delete Message
 message.label.wikiTitle  =Wiki Title
 message.label.pageContent  =Page content
@@ -142,7 +141,6 @@
 label.authoring.advance.limited.input  =Maximum number of characters per posting
 label.authoring.basic.instruction  =Instructions
 label.authoring.advance.allow.edit  =Allow learners to change their own postings
-label.authoring.advance.use.richeditor  =Allow learners to use rich text editor
 label.authoring.advance.maximum.reply  =Maximum:
 button.release.mark  =Release marks
 label.authoring.advance.no.minimum  =No minimum
Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r16be4f178e2ed2998569f494ebe63cf5066836a6 -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -66,11 +66,10 @@
 message.msg.maxFileSize  =Max 250K
 title.messageTopic.open  =Topic Details
 title.message.add  =Add Message
-title.message.open  =View Message
 title.message.reply  =Reply Message
-title.message.edit  =Edit Message
+title.wiki.edit  =Edit Wiki
 title.message.view  =Message Board
-title.message.view.topic  =View Message
+title.wiki.view.topic  =View Wiki
 title.message.delete  =Delete Message
 message.label.wikiTitle  =Wiki Title
 message.label.pageContent  =Page content
@@ -142,7 +141,6 @@
 label.authoring.advance.limited.input  =Maximum number of characters per posting
 label.authoring.basic.instruction  =Instructions
 label.authoring.advance.allow.edit  =Allow learners to change their own postings
-label.authoring.advance.use.richeditor  =Allow learners to use rich text editor
 label.authoring.advance.maximum.reply  =Maximum:
 button.release.mark  =Release marks
 label.authoring.advance.no.minimum  =No minimum
Index: lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/persistence/Wiki.java
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/persistence/Wiki.java	(.../Wiki.java)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/persistence/Wiki.java	(.../Wiki.java)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -446,16 +446,6 @@
 	public void setAllowEdit(boolean allowEdit) {
 		this.allowEdit = allowEdit;
 	}
-	/**
-	 * @hibernate.property column="allow_rich_editor"
-	 * @return
-	 */
-	public boolean isAllowRichEditor() {
-		return allowRichEditor;
-	}
-	public void setAllowRichEditor(boolean allowRichEditor) {
-		this.allowRichEditor = allowRichEditor;
-	}
 	
 	public static Wiki newInstance(Wiki fromContent, Long contentId, WikiToolContentHandler wikiToolContentHandler){
 		Wiki toContent = new Wiki();
Index: lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -912,7 +912,7 @@
 	    	toolContentObj.setAllowAnonym(Boolean.FALSE);
 	    	toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value
 	    	toolContentObj.setAllowNewTopic(Boolean.TRUE);
-	    	toolContentObj.setAllowRichEditor(Boolean.FALSE);
+	    	//toolContentObj.setAllowRichEditor(Boolean.FALSE);
 	    	toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value
 	    	toolContentObj.setContentId(toolContentId);
 	    	toolContentObj.setContentInUse(Boolean.FALSE);
Index: lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -932,12 +932,12 @@
 			if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
 				return errors;
 			}
-			if(!form.getWiki().isAllowRichEditor() && form.getWiki().isLimitedInput()){
+			/*if(!form.getWiki().isAllowRichEditor() && form.getWiki().isLimitedInput()){
 				if(form.getWiki().getLimitedChar() <=0){
 					ActionMessage error = new ActionMessage("error.limit.char.less.zero");
 					errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 				}
-			}
+			}*/
 			if(!form.getWiki().isAllowNewTopic()){
 				if(form.getWiki().getMaximumReply() !=0 
 						&& (form.getWiki().getMaximumReply() < form.getWiki().getMinimumReply())){
Index: lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -211,8 +211,10 @@
 		// if isLimitedInput = false then don't restrict the number of chars
 		// Indicate don't restrict number of chars by allowNumber = 0
 		Long wikiId = wiki.getUid();
-		Boolean allowRichEditor = new Boolean(wiki.isAllowRichEditor());
-		int allowNumber = wiki.isLimitedInput() || wiki.isAllowRichEditor() ? wiki.getLimitedChar() : 0;
+		//Boolean allowRichEditor = new Boolean(wiki.isAllowRichEditor());
+		Boolean allowRichEditor = new Boolean(true);
+		//int allowNumber = wiki.isLimitedInput() || wiki.isAllowRichEditor() ? wiki.getLimitedChar() : 0;
+		int allowNumber = wiki.getLimitedChar();
 		
 		// get notebook entry
 		String entryText = new String();
Index: lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/forms/WikiForm.java	(.../WikiForm.java)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/src/java/org/lams/lams/tool/wiki/web/forms/WikiForm.java	(.../WikiForm.java)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -113,7 +113,7 @@
     public void reset(ActionMapping mapping, HttpServletRequest request){
     	wiki.setAllowEdit(false);
     	wiki.setAllowAnonym(false);
-    	wiki.setAllowRichEditor(false);
+    	//wiki.setAllowRichEditor(false);
     	wiki.setLimitedInput(false);
     	wiki.setLockWhenFinished(false);
     	wiki.setAllowNewTopic(false);
Index: lams_tool_wiki_orig/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -72,7 +72,7 @@
 	</definition>
 	
 	<definition name="tiles:/learning/wiki/viewTopic" extends="tiles:learner:layout">
-    	<put name="pageTitleKey" value="title.message.view.topic"/>
+    	<put name="pageTitleKey" value="title.wiki.view.topic"/>
     	<put name="body" value="/jsps/learning/viewtopic.jsp"/>
 	</definition>
 	
@@ -87,7 +87,7 @@
     </definition>
     
     <definition name="tiles:/learning/wiki/editTopic" extends="tiles:learner:layout">
-    	<put name="pageTitleKey" value="title.message.edit"/>
+    	<put name="pageTitleKey" value="title.wiki.edit"/>
     	<put name="body" value="/jsps/learning/edit.jsp"/>
 	</definition>
     <definition name="tiles:/learning/reflection" extends="tiles:learner:layout">
Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -32,15 +32,6 @@
 </p>
 
 <p>
-	<html:checkbox property="wiki.allowRichEditor" styleId="richEditor"
-		styleClass="noBorder">
-	</html:checkbox>
-	<label for="richEditor">
-		<fmt:message key="label.authoring.advance.use.richeditor" />
-	</label>
-</p>
-
-<p>
 	<html:checkbox property="wiki.limitedInput" styleId="limitedInput"	styleClass="noBorder">
 	</html:checkbox>
 	<label for="limitedInput">
@@ -144,27 +135,17 @@
 
 <script type="text/javascript">
 			var limit = document.getElementById("limitedInput");
-			var rich = document.getElementById("richEditor");
 			var limitChar = document.getElementById("limitedChar");
 
 			limit.onclick= initAdvanced;
 			function initAdvanced(){
 				if(limit.checked){
 					limitChar.disabled=false;
-					rich.checked=false;
 				}else{
 					limitChar.disabled=true;
 				}
 				
 			}
-			rich.onclick = function(){
-				if(this.checked){
-					limitChar.disabled=true;
-					limit.checked=false;
-				}else{
-					limitChar.disabled=false;
-				}
-			}
 			initAdvanced();
 			limitChar.onblur=function(){
 				var min = 0;
Index: lams_tool_wiki_orig/web/jsps/learning/create.jsp
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/web/jsps/learning/create.jsp	(.../create.jsp)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/web/jsps/learning/create.jsp	(.../create.jsp)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -14,7 +14,7 @@
 	<div id="content">
 		
 		<h2>
-			<fmt:message key="title.message.edit" />
+			<fmt:message key="title.wiki.edit" />
 		</h2>
 		
 		<html:errors property="error" />
Index: lams_tool_wiki_orig/web/jsps/learning/edit.jsp
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -14,7 +14,7 @@
 	
 	
 		<h2>
-			<fmt:message key="title.message.edit" />
+			<fmt:message key="title.wiki.edit" />
 		</h2>
 		
 		<html:errors property="error" />
Index: lams_tool_wiki_orig/web/jsps/learning/message/bodyarea.jsp
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/web/jsps/learning/message/bodyarea.jsp	(.../bodyarea.jsp)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -1,50 +1,10 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
 <div>
-<c:choose>
-	<c:when test="${sessionMap.allowRichEditor}">
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<lams:FCKEditor id="message.body"
-				value="${formBean.message.body}"
-				toolbarSet="Default-Learner"></lams:FCKEditor>
-	</c:when>
-	<c:otherwise>
-		<%-- Does not user general tag becuase this field need keep compatible with FCKEditor's content --%>
-		<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body" styleId="messageBody" />
-		<BR>
-		<%-- If limitChars == 0, then we don't want to limit the characters at all. --%>
-		<c:if test="${sessionMap.limitedChars > 0}">
-			<fmt:message key="label.char.left" />:  
-			<span id="charleftDiv"></span>
-			<input type="hidden" name="limitCount" id="limitCount" />
-			<script type="text/javascript">
-					<!--
-					var limit = <c:out value="${sessionMap.limitedChars}"/>;
-					var bodyTxt = document.getElementById("messageBody");
-					var limitCount = document.getElementById("limitCount");
-					
-					var showDiv = document.getElementById("charleftDiv");
-					limitCount.value=limit - bodyTxt.value.length;
-					showDiv.innerHTML=limitCount.value;
-					function calculateLeft(){
-						if(this.value.length > limit){
-							this.value = this.value.substring(0,limit);
-							//fix a bug: when change "this.value", onchange event won't be fired any more. So this will 
-							//manually handle onchange event. It is a kind of crack coding!
-							filterData(document.getElementById('messageBody'),document.getElementById('message.body__lamshidden'));
-						}else{
-							limitCount.value = limit - this.value.length;
-							showDiv.innerHTML=limitCount.value;							
-						}
-					}
-					
-					bodyTxt.onkeydown = calculateLeft;
-					bodyTxt.onkeyup = calculateLeft;
-					-->
-			</script>
-		</c:if>
-	</c:otherwise>
-</c:choose>
+	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+	<lams:FCKEditor id="message.body"
+			value="${formBean.message.body}"
+			toolbarSet="Default-Learner"></lams:FCKEditor>
 <BR>
 <html:errors property="message.body" />
 
Index: lams_tool_wiki_orig/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -rfbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d -r1e131f532456c075126b0bb76ecc385f19ff98cf
--- lams_tool_wiki_orig/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision fbc3b6e5c7d55e5f8a49719dc095e0dd9f8e844d)
+++ lams_tool_wiki_orig/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 1e131f532456c075126b0bb76ecc385f19ff98cf)
@@ -28,7 +28,7 @@
 
 		</div>
 		<h2>
-			<fmt:message key="title.message.view.topic" />
+			<fmt:message key="title.wiki.view.topic" />
 		</h2>
 
 	</div>