Index: lams_tool_chat/web/pages/monitoring/headItems.jsp
===================================================================
diff -u -r39a4ece987cbb4ab50fd15fc15d2dbb210fece38 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_chat/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision 39a4ece987cbb4ab50fd15fc15d2dbb210fece38)
+++ lams_tool_chat/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -7,9 +7,6 @@
 
 <!--  Tab Controller Script -->
 <script type="text/javascript">
-	var imgRoot="${lams}images/";
-	var themeName="aqua";
-        
 	function init(){
 		initTabSize(4);
             
Fisheye: Tag cb76f52be2b0d9280291cf11cac9f4efe99a0648 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/javascript/fckcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r72862d19e593b3413e3d25913428d54bc379fde5 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -46,8 +46,6 @@
 			<lams:FCKEditor id="forum.instructions"
 				value="${formBean.forum.instructions}"
 				contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
-
-			<%--			<lams:SetEditor id="forum.instructions" text="${formBean.forum.instructions}" key="label.authoring.basic.instruction"/>--%>
 		</td>
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/authoring/definelater.jsp
===================================================================
diff -u -r3713058c6b00a5ea73f4b3eff667aba0c9d41534 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision 3713058c6b00a5ea73f4b3eff667aba0c9d41534)
+++ lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -30,6 +30,5 @@
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 			toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" 
 			accessMode="teacher" defineLater="yes" customiseSessionID="${formBean.sessionMapID}" />
-		<lams:HTMLEditor />
 	</div>
 </html:form>
Index: lams_tool_forum/web/jsps/authoring/definelaterheader.jsp
===================================================================
diff -u -r6bb2802253132bb7da7aa0e9dba50f94dd617f3a -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_forum/web/jsps/authoring/definelaterheader.jsp	(.../definelaterheader.jsp)	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
+++ lams_tool_forum/web/jsps/authoring/definelaterheader.jsp	(.../definelaterheader.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -5,22 +5,10 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
-	<script>
-    
-    	var imgRoot="${lams}images/";
-	    var themeName="aqua";
-        
+<script>
         function init(){
-        
             initTabSize(1);
-            
             selectTab(1); //select the default tab;
-            
-            initEditor("Title");
-            initEditor("Instructions");
-            initEditor("OnlineInstruction");
-            initEditor("OfflineInstruction");
-            
         }     
         
         function doSelectTab(tabId) {
@@ -30,6 +18,4 @@
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);
         } 
-        
-       
-    </script>
\ No newline at end of file
+</script>
Index: lams_tool_forum/web/jsps/authoring/header.jsp
===================================================================
diff -u -r72862d19e593b3413e3d25913428d54bc379fde5 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_forum/web/jsps/authoring/header.jsp	(.../header.jsp)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
+++ lams_tool_forum/web/jsps/authoring/header.jsp	(.../header.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -9,9 +9,6 @@
 
 <script type="text/javascript">
      //<![CDATA[
-	var imgRoot="${lams}images/";
-	var themeName="aqua";
-        
 	function init(){
 		initTabSize(3);
             
Index: lams_tool_forum/web/jsps/monitoring/header.jsp
===================================================================
diff -u -r139523bb20c86ecde4601e198801a737d96d7556 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_forum/web/jsps/monitoring/header.jsp	(.../header.jsp)	(revision 139523bb20c86ecde4601e198801a737d96d7556)
+++ lams_tool_forum/web/jsps/monitoring/header.jsp	(.../header.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -8,9 +8,6 @@
 
 <script type="text/javascript">
      //<![CDATA[
-	var imgRoot="${lams}images/";
-	var themeName="aqua";
-        
 	function init(){
 		initTabSize(4);
 		selectTab(1);
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -r47f339f1264a33e426aba033e60507eefa1bf67d -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 47f339f1264a33e426aba033e60507eefa1bf67d)
+++ lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -9,11 +9,7 @@
 	<title><fmt:message key="activity.title" /></title>
 
 	<script type="text/javascript">
-    
-    	var imgRoot="<lams:LAMSURL />images/";
-	    var themeName="aqua";
-        
-        function init(){
+		function init(){
 			var showBasicContent = "${requestScope.showBasicContent}";
 			if (showBasicContent != "true") {
 	            initTabSize(3);
Index: lams_tool_nb/web/monitoring/monitoring.jsp
===================================================================
diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
+++ lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -22,9 +22,6 @@
 
 	<script type="text/javascript">
 
-		var imgRoot="${lams}images/";
-	    var themeName="aqua";
-	
 		 function init(){
             initTabSize(4);
             var tag = document.getElementById("currentTab");
Index: lams_tool_notebook/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r56af73875ad9b4f953d2951479e49dbc1f2715f9 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_notebook/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 56af73875ad9b4f953d2951479e49dbc1f2715f9)
+++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -61,15 +61,15 @@
 										<fmt:message key="label.created" />
 									</td>
 									<td>
-										${user.entryDTO.createDate }
+										<lams:Date value="${user.entryDTO.createDate }"></lams:Date>
 									</td>
 								</tr>
 								<tr>
 									<td class="field-name" width="20%">
 										<fmt:message key="label.lastModified" />
 									</td>
 									<td>
-										${user.entryDTO.lastModified }
+										<lams:Date value="${user.entryDTO.lastModified }"></lams:Date>
 									</td>
 								</tr>
 
Index: lams_tool_notebook/web/pages/monitoring/headItems.jsp
===================================================================
diff -u -r5948e17402e1ad574aeddbe55f93dca2f58bbbec -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_notebook/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision 5948e17402e1ad574aeddbe55f93dca2f58bbbec)
+++ lams_tool_notebook/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -7,9 +7,6 @@
 
 <!--  Tab Controller Script -->
 <script type="text/javascript">
-	var imgRoot="${lams}images/";
-	var themeName="aqua";
-        
 	function init(){
 		initTabSize(4);
             
Index: lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp
===================================================================
diff -u -r56af73875ad9b4f953d2951479e49dbc1f2715f9 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp	(.../notebookDisplay.jsp)	(revision 56af73875ad9b4f953d2951479e49dbc1f2715f9)
+++ lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp	(.../notebookDisplay.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -13,15 +13,16 @@
 			<fmt:message key="label.created" />
 		</td>
 		<td>
-			${userDTO.entryDTO.createDate }
+			<lams:Date value="${userDTO.entryDTO.createDate }"></lams:Date>
+			
 		</td>
 	</tr>
 	<tr>
 		<td class="field-name" width="20%">
 			<fmt:message key="label.lastModified" />
 		</td>
 		<td>
-			${userDTO.entryDTO.lastModified }
+			<lams:Date value="${userDTO.entryDTO.lastModified }"></lams:Date>
 		</td>
 	</tr>
 
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -rb3f41153ea9815528aed7730b3760cc11f48bf75 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision b3f41153ea9815528aed7730b3760cc11f48bf75)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -21,10 +21,6 @@
 	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
 	
 	<script type="text/javascript">
-    
-    	var imgRoot="${lams}images/";
-	    var themeName="aqua";
-        
         function init(){
         
             initTabSize(3);
@@ -69,11 +65,9 @@
 		</div>
 
 		<div id="content">
-			<table>
-			<tr><td>
+
 			<%@ include file="/common/messages.jsp"%>
-			</td></tr>
-			</table>
+
 			
 			<html:form action="authoring" method="post" styleId="authoringForm" enctype="multipart/form-data">
 				<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
Index: lams_tool_sbmt/web/authoring/definelater.jsp
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_sbmt/web/authoring/definelater.jsp	(.../definelater.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_sbmt/web/authoring/definelater.jsp	(.../definelater.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -18,19 +18,13 @@
 	<title><fmt:message key="activity.title" /></title>
 
 	<script>
-    
-    	var imgRoot="${lams}images/";
-	    var themeName="aqua";
-        
+      
         function init(){
         
             initTabSize(1);
             
             var tag = document.getElementById("currentTab");
             selectTab(1); //select the default tab;
-            
-            initEditor("Title");
-            initEditor("Instructions");
         }     
         
         function doSelectTab(tabId) {
@@ -77,9 +71,6 @@
 				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" accessMode="teacher" 
 					toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" defineLater="true" 
 					customiseSessionID="${formBean.sessionMapID}" />
-
-				<lams:HTMLEditor />
-
 			</html:form>
 		</div>
 		<div id="footer"></div>
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
diff -u -r83ebe1df0e0c764033c0cde819399fd44d8f821b -rcb76f52be2b0d9280291cf11cac9f4efe99a0648
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 83ebe1df0e0c764033c0cde819399fd44d8f821b)
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
@@ -9,9 +9,6 @@
 	<!-- ********************  CSS ********************** -->
 	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
 	<script type="text/javascript">
-		var imgRoot="${lams}images/";
-	    var themeName="aqua";
-	
 		 function init(){
             initTabSize(4);
             
@@ -20,11 +17,6 @@
 	    		selectTab(tag.value);
             else
                 selectTab(1); //select the default tab;
-            
-            initEditor("Title");
-            initEditor("Instructions");
-            initEditor("Comments");
-            
         }   
         
 		function doSelectTab(tabId) {
@@ -118,12 +110,9 @@
 				<!-- tab content 4 (Stats) -->
 				<lams:TabBody id="4" titleKey="label.monitoring.heading.stats.desc" page="parts/statistic.jsp" />
 				<!-- end of content (Stats) -->
-		
-
 			</html:form>
 		</div>
 		<div id="footer"></div>
 	</div>
-	<lams:HTMLEditor />
 </body>
 </html:html>