Index: lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag	20 Feb 2009 03:58:19 -0000	1.5
+++ lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag	23 Jul 2009 18:02:58 -0000	1.6
@@ -28,29 +28,6 @@
 
 <c:set var="basePath"><lams:LAMSURL/>/fckeditor/</c:set>
 
-<!-- 
-<script type="text/javascript">
-	var oFCKeditor=new FCKeditor('${id}');
-	oFCKeditor.BasePath= "${basePath}";
-	oFCKeditor.ToolbarSet= "${toolbarSet}";
-	oFCKeditor.Value= '${value}';
-
-	oFCKeditor.Config["ImageBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["LinkBrowserURL"]=  "${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["FlashBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["ImageUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["LinkUploadURL"]=   "${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["FlashUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/";
-
-	oFCKeditor.Config["AutoDetectLanguage"]= false ;
-	oFCKeditor.Config["DefaultLanguage"]= "${language}" ;
-
-	oFCKeditor.Config["ToolbarStartExpanded"]= "${displayExpanded}" ;
-
-	oFCKeditor.Create();
-</script>
--->
-
 <fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
Index: lams_tool_assessment/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/web/WEB-INF/tags/headItems.tag	29 Jan 2009 05:59:05 -0000	1.1
+++ lams_tool_assessment/web/WEB-INF/tags/headItems.tag	23 Jul 2009 18:02:57 -0000	1.2
@@ -27,8 +27,7 @@
  *	Description: Includes all the standard head items e.g. the 
  * lams css files, sets the content type, standard javascript files.
  */
-
-		%>
+%>
 <%@ tag body-content="empty"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
@@ -44,9 +43,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: lams_tool_assessment/web/common/fckeditorheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/common/Attic/fckeditorheader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/web/common/fckeditorheader.jsp	29 Jan 2009 05:59:05 -0000	1.1
+++ lams_tool_assessment/web/common/fckeditorheader.jsp	23 Jul 2009 18:02:58 -0000	1.2
@@ -1,5 +1 @@
 <%@ include file="/common/taglibs.jsp"%>
-
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
Index: lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/FCKEditor.tag,v
diff -u -r1.9 -r1.10
--- lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag	20 Feb 2009 03:08:57 -0000	1.9
+++ lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag	23 Jul 2009 18:02:55 -0000	1.10
@@ -1,6 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="fck-editor" prefix="fck"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -28,29 +29,6 @@
 
 <c:set var="basePath"><lams:LAMSURL/>/fckeditor/</c:set>
 
-<!-- 
-<script type="text/javascript">
-	var oFCKeditor=new FCKeditor('${id}');
-	oFCKeditor.BasePath= "${basePath}";
-	oFCKeditor.ToolbarSet= "${toolbarSet}";
-	oFCKeditor.Value= '${value}';
-
-	oFCKeditor.Config["ImageBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["LinkBrowserURL"]=  "${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["FlashBrowserURL"]= "${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector&amp;CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["ImageUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["LinkUploadURL"]=   "${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/";
-	oFCKeditor.Config["FlashUploadURL"]=  "${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/";
-
-	oFCKeditor.Config["AutoDetectLanguage"]= false ;
-	oFCKeditor.Config["DefaultLanguage"]= "${language}" ;
-
-	oFCKeditor.Config["ToolbarStartExpanded"]= "${displayExpanded}" ;
-
-	oFCKeditor.Create();
-</script>
--->
-
 <fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
Index: lams_tool_notebook/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.6 -r1.7
Binary files differ
Index: lams_tool_notebook/web/common/learnerheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/common/learnerheader.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/web/common/learnerheader.jsp	8 Jun 2007 01:39:51 -0000	1.3
+++ lams_tool_notebook/web/common/learnerheader.jsp	23 Jul 2009 18:02:55 -0000	1.4
@@ -14,9 +14,5 @@
 	<link href="${tool}pages/learning/notebook_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 </lams:head>