Fisheye: Tag 0bb543134937df6708d57f352dde50c6e1c16735 refers to a dead (removed) revision in file `lams_central/web/css/ckeditor_style.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0bb543134937df6708d57f352dde50c6e1c16735 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/ckcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -147,7 +147,7 @@
 	
 	<servlet-mapping>
 	    <servlet-name>Connector</servlet-name>
-	    <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	    <url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
 	
 	<servlet-mapping>
Index: lams_tool_bbb/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -3,10 +3,10 @@
 	<url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
-<!--  FCKEditor Connector Configuration -->
+<!--  CKEditor Connector Configuration -->
 <servlet-mapping>
 	<servlet-name>Connector</servlet-name>
-	<url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	<url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 </servlet-mapping>
 
 <servlet-mapping>
Index: lams_tool_bbb/conf/xdoclet/servlets.xml
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -20,7 +20,7 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
+<!--  CKEditor Connector Configuration -->
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
Index: lams_tool_bbb/conf/xdoclet/taglibs.xml
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -63,11 +63,6 @@
 		<!--  ======================================================== -->	
 		<!--   Customized Tag Library -->
 		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-		</taglib>
-		
 		 <taglib>
 		   <taglib-uri>tags-lams</taglib-uri>
 		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
Fisheye: Tag 0bb543134937df6708d57f352dde50c6e1c16735 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u
--- lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	(revision 0)
+++ lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -0,0 +1,75 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
+<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
+<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
+
+<c:set var="language">
+	<lams:user property="fckLanguageMapping" />
+</c:set>
+
+<c:if test="${empty toolbarSet}">
+	<c:set var="toolbarSet" value="Default" />
+</c:if>
+
+<c:if test="${empty displayExpanded}">
+	<c:set var="displayExpanded" value="true" />
+</c:if>
+
+<c:if test="${empty width}">
+	<c:set var="width" value="750px" />
+</c:if>
+
+<c:if test="${empty height}">
+	<c:set var="height" value="100px" />
+</c:if>
+
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+
+<c:if test="${empty ckEditorBasePath}">
+	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
+</c:if>
+
+<script type="text/javascript">
+	function initializeCKEditor(){
+		CKEDITOR.basePath = "${ckEditorBasePath}";
+	    
+		var instance = CKEDITOR.replace( "${id}", {
+				width                         : "${width}",
+				height                        : "${height}",
+				toolbar                       : "${toolbarSet}",
+				language                      : "${language}",
+				defaultLangugage              : "en",
+				toolbarStartupExpanded        : ${displayExpanded},
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
+				contentFolderID				  : "${contentFolderID}"
+		});
+		instance.initializeFunction = initializeCKEditor;
+		return instance;
+	}
+	
+	// run when page is loaded
+	initializeCKEditor();
+
+	function reinitializeCKEditorInstances(){
+		for (var instanceId in CKEDITOR.instances){
+			var instance = CKEDITOR.instances[instanceId];
+			var initializeFunction = instance.initializeFunction;
+			CKEDITOR.remove(instance);
+			instance = initializeFunction();
+			instance.initializeFunction = initializeFunction;
+		}
+	}
+</script>
Index: lams_tool_bbb/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_bbb/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_bbb/web/WEB-INF/tags/TextSearch.tag	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -0,0 +1,136 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * TextSearch.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays form for creating text search conditions.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%-- Required attributes --%>
+<%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
+<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
+
+<%-- Optional attributes --%>
+<%@ attribute name="action" required="false" rtexprvalue="true" %>
+<%@ attribute name="formID" required="false" rtexprvalue="true" %>
+<%@ attribute name="headingLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="allWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="phraseLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="anyWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="excludedWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelAction" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty action}">
+	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+</c:if>
+<c:if test="${empty cancelAction}">
+	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+</c:if>
+<c:if test="${empty formID}">
+	<c:set var="formID" value="textSearchForm" scope="request"/>
+</c:if>
+<c:if test="${empty headingFindTextLabelKey}">
+	<c:set var="headingLabelKey" value="textsearch.heading" scope="request"/>
+</c:if>
+<c:if test="${empty allWordsLabelKey}">
+	<c:set var="allWordsLabelKey" value="textsearch.all.words" scope="request"/>
+</c:if>
+<c:if test="${empty phraseLabelKey}">
+	<c:set var="phraseLabelKey" value="textsearch.phrase" scope="request"/>
+</c:if>
+<c:if test="${empty anyWordsLabelKey}">
+	<c:set var="anyWordsLabelKey" value="textsearch.any.words" scope="request"/>
+</c:if>
+<c:if test="${empty excludedWordsLabelKey}">
+	<c:set var="excludedWordsLabelKey" value="textsearch.excluded.words" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="textsearch.save" scope="request"/>
+</c:if>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="textsearch.cancel" scope="request"/>
+</c:if>
+
+<!-- begin text search form content -->
+	
+<c:if test="${wrapInFormTag}">
+	<form action="${action}" id="${formID}" name="${formID}">
+</c:if>
+		<html:hidden property="sessionMapID" />
+		<h4><fmt:message key="${headingLabelKey}" /></h4>
+		<table>
+			<tr>
+				<td>
+					<fmt:message key="${allWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="allWords" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${phraseLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="phrase" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${anyWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="anyWords" /> 
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${excludedWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="excludedWords" /> 
+				</td>
+			</tr>
+		</table>
+<c:if test="${wrapInFormTag}">
+	<lams:ImgButtonWrapper>
+		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
+		</a>
+		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
+		</a>
+	</lams:ImgButtonWrapper>
+	</form>
+</c:if>
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -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_bbb/web/common/simpleHeader.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/web/common/simpleHeader.jsp	(.../simpleHeader.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/common/simpleHeader.jsp	(.../simpleHeader.jsp)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -14,12 +14,8 @@
 	
 	<lams:css/>
 	<link href="${tool}pages/learning/bbb_style.css" rel="stylesheet" type="text/css">
-
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 	
 	<%-- TODO is this the best place to import these scripts ?	--%>
 	<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>
Index: lams_tool_bbb/web/common/taglibs.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -8,5 +8,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
\ No newline at end of file
+<%@ taglib uri="tags-lams" prefix="lams"%>
\ No newline at end of file
Index: lams_tool_bbb/web/pages/authoring/basic.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_bbb/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -21,8 +21,8 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.instructions"></fmt:message>
 			</div>
-			<lams:FCKEditor id="instructions" value="${formBean.instructions}"
-				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
+			<lams:CKEditor id="instructions" value="${formBean.instructions}"
+				contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
 		</td>
 	</tr>
 
Index: lams_tool_eadventure/web/WEB-INF/web.xml
===================================================================
diff -u -r2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_eadventure/web/WEB-INF/web.xml	(.../web.xml)	(revision 2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d)
+++ lams_tool_eadventure/web/WEB-INF/web.xml	(.../web.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -159,7 +159,7 @@
 	
 	<servlet-mapping>
 	    <servlet-name>Connector</servlet-name>
-	    <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	    <url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
 	
 	<servlet-mapping>
Index: lams_tool_imscc/web/WEB-INF/web.xml
===================================================================
diff -u -r2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 2373c8f900d13fe819e24ad5ba34a30cbdc1fd8d)
+++ lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -152,7 +152,7 @@
 	
 	<servlet-mapping>
 	    <servlet-name>Connector</servlet-name>
-	    <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	    <url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
 	
 	<servlet-mapping>
Index: lams_tool_wookie/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -3,10 +3,10 @@
 	<url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
-<!--  FCKEditor Connector Configuration -->
+<!--  CKEditor Connector Configuration -->
 <servlet-mapping>
 	<servlet-name>Connector</servlet-name>
-	<url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	<url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 </servlet-mapping>
 
 <servlet-mapping>
Index: lams_tool_wookie/conf/xdoclet/servlets.xml
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -20,7 +20,7 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
+<!--  CKEditor Connector Configuration -->
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
Index: lams_tool_wookie/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -63,10 +63,6 @@
 		<!--  ======================================================== -->	
 		<!--   Customized Tag Library -->
 		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-		</taglib>
 		
 		 <taglib>
 		   <taglib-uri>tags-lams</taglib-uri>
Fisheye: Tag 0bb543134937df6708d57f352dde50c6e1c16735 refers to a dead (removed) revision in file `lams_tool_wookie/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -61,6 +61,9 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
 
 <!-- begin tab content -->
 <script type="text/javascript">
@@ -72,7 +75,17 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+			var notifyCloseURL = "${notifyCloseURL}";
+			if (notifyCloseURL == ""){
+				location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			} else {
+				if (window.parent.opener == null){
+					window.location.href = notifyCloseURL;
+				} else {
+					window.parent.opener.location.href = notifyCloseURL;
+				}
+			}
+        	
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
@@ -90,4 +103,4 @@
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u
--- lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag	(revision 0)
+++ lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -0,0 +1,75 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
+<%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
+<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
+
+<c:set var="language">
+	<lams:user property="fckLanguageMapping" />
+</c:set>
+
+<c:if test="${empty toolbarSet}">
+	<c:set var="toolbarSet" value="Default" />
+</c:if>
+
+<c:if test="${empty displayExpanded}">
+	<c:set var="displayExpanded" value="true" />
+</c:if>
+
+<c:if test="${empty width}">
+	<c:set var="width" value="750px" />
+</c:if>
+
+<c:if test="${empty height}">
+	<c:set var="height" value="100px" />
+</c:if>
+
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+
+<c:if test="${empty ckEditorBasePath}">
+	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
+</c:if>
+
+<script type="text/javascript">
+	function initializeCKEditor(){
+		CKEDITOR.basePath = "${ckEditorBasePath}";
+	    
+		var instance = CKEDITOR.replace( "${id}", {
+				width                         : "${width}",
+				height                        : "${height}",
+				toolbar                       : "${toolbarSet}",
+				language                      : "${language}",
+				defaultLangugage              : "en",
+				toolbarStartupExpanded        : ${displayExpanded},
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
+				contentFolderID				  : "${contentFolderID}"
+		});
+		instance.initializeFunction = initializeCKEditor;
+		return instance;
+	}
+	
+	// run when page is loaded
+	initializeCKEditor();
+
+	function reinitializeCKEditorInstances(){
+		for (var instanceId in CKEDITOR.instances){
+			var instance = CKEDITOR.instances[instanceId];
+			var initializeFunction = instance.initializeFunction;
+			CKEDITOR.remove(instance);
+			instance = initializeFunction();
+			instance.initializeFunction = initializeFunction;
+		}
+	}
+</script>
Index: lams_tool_wookie/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -83,4 +83,4 @@
 					  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 				</object>
 			</noscript>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_wookie/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_wookie/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -133,4 +133,4 @@
 	</lams:ImgButtonWrapper>
 	</form>
 </c:if>
-<!-- end text search form content -->
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_wookie/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -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_wookie/web/common/learnerheader.jsp
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -12,12 +12,8 @@
 		<fmt:message key="activity.title" />
 	</title>
 	<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>
 	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${tool}includes/javascript/learning.js"></script>
 </lams:head>
Index: lams_tool_wookie/web/common/taglibs.jsp
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
  
Index: lams_tool_wookie/web/pages/authoring/basic.jsp
===================================================================
diff -u -r4d22e857622dc7590f93c841a25f24a4e3dcebe8 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 4d22e857622dc7590f93c841a25f24a4e3dcebe8)
+++ lams_tool_wookie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -156,9 +156,9 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.instructions"></fmt:message>
 			</div>
-			<lams:FCKEditor id="instructions"
+			<lams:CKEditor id="instructions"
 				value="${formBean.instructions}"
-				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
+				contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
 		</td>
 	</tr>
 	<tr align="center">
Index: lams_tool_wookie/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -19,10 +19,7 @@
 		<link href="${tool}pages/learning/wookie_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>
 	
Index: lams_tool_wookie/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r0bb543134937df6708d57f352dde50c6e1c16735
--- lams_tool_wookie/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 0bb543134937df6708d57f352dde50c6e1c16735)
@@ -17,7 +17,6 @@
 		
 		<link href="${tool}pages/learning/wookie_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>