Index: lams_tool_eadventure/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/web.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_eadventure/web/WEB-INF/web.xml	12 Dec 2011 09:21:50 -0000	1.4
+++ lams_tool_eadventure/web/WEB-INF/web.xml	14 Dec 2011 07:13:11 -0000	1.5
@@ -222,13 +222,6 @@
 		    <taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
 		  </taglib>
 		<!--  ======================================================== -->	
-		<!--   FCKEditor Tag Library -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/fckeditor/FCKeditor.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
 		<!--   Customized Tag Library -->
 		<!--  ======================================================== -->	
 		<taglib>
Index: lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	11 Dec 2011 21:30:32 -0000	1.3
+++ lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	14 Dec 2011 07:13:11 -0000	1.4
@@ -61,26 +61,31 @@
 <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">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
-	var noGameSelected = "<fmt:message key='error.eadventure.not.ead.added' />";
-	
     function doSubmit_Form_Only() {
-			var game=document.getElementById("gameName");
-		if (game==null){
-			alert(noGameSelected);
-		} else {
-		document.getElementById("${formID}").submit();
-			}
-    	
+    	document.getElementById("${formID}").submit();
     }
     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;
@@ -98,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_eadventure/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	14 Dec 2011 07:13:11 -0000	1.1
@@ -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>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_eadventure/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_eadventure/web/WEB-INF/tags/Passon.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/Attic/Passon.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/WEB-INF/tags/Passon.tag	11 Dec 2011 21:30:33 -0000	1.3
+++ lams_tool_eadventure/web/WEB-INF/tags/Passon.tag	14 Dec 2011 07:13:10 -0000	1.4
@@ -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_eadventure/web/WEB-INF/tags/TabName.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/TabName.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/WEB-INF/tags/TabName.tag	11 Dec 2011 21:30:33 -0000	1.3
+++ lams_tool_eadventure/web/WEB-INF/tags/TabName.tag	14 Dec 2011 07:13:10 -0000	1.4
@@ -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_eadventure/web/WEB-INF/tags/TextSearch.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/TextSearch.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_eadventure/web/WEB-INF/tags/TextSearch.tag	14 Dec 2011 07:13:10 -0000	1.1
@@ -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
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_eadventure/web/WEB-INF/tlds/fckeditor/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld	11 Dec 2011 21:30:33 -0000	1.3
+++ lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld	14 Dec 2011 07:13:11 -0000	1.4
@@ -123,6 +123,26 @@
    </tag>
    <tag>
 
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -167,23 +187,14 @@
    </tag>
    <tag>
 
-      <description>Converts role name into form usable as message eadventure key</description>
-      <display-name>Converts role name into form usable as message eadventure key</display-name>
+      <description>Checks whether Flash enabled for learner</description>
+      <display-name>Checks whether Flash enabled for learner</display-name>
       <icon>    
       </icon>
-      <name>role</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <name>LearnerFlashEnabled</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
       <body-content>empty</body-content>
 
-      <attribute>
-         <description>Converts role name into form usable as message eadventure key</description>
-         <name>role</name>
-         <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
    </tag>
    <tag>
 
@@ -289,11 +300,6 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -436,8 +442,8 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
    	<tag-file>
        <name>AuthoringButton</name>
@@ -466,6 +472,10 @@
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
@@ -497,15 +507,15 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-    <tag>
-    	<description>Checks whether Flash enabled for learner</description>
-    	<display-name>Checks whether Flash enabled for learner</display-name>
-    	<icon>    
-    	</icon>
-    	<name>LearnerFlashEnabled</name>
-    	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-    	<body-content>empty</body-content>
-	</tag>
+  	<tag>
+	  	<description>Checks whether Flash enabled for learner</description>
+	  	<display-name>Checks whether Flash enabled for learner</display-name>
+	 	<icon>    
+	 	</icon>
+	 	<name>LearnerFlashEnabled</name>
+	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
+	 	<body-content>empty</body-content>
+ 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Index: lams_tool_eadventure/web/common/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/common/taglibs.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/common/taglibs.jsp	11 Dec 2011 21:30:36 -0000	1.3
+++ lams_tool_eadventure/web/common/taglibs.jsp	14 Dec 2011 07:13:11 -0000	1.4
@@ -8,5 +8,4 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
 
Index: lams_tool_eadventure/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/authoring/authoring.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/authoring/authoring.jsp	11 Dec 2011 21:30:38 -0000	1.3
+++ lams_tool_eadventure/web/pages/authoring/authoring.jsp	14 Dec 2011 07:13:11 -0000	1.4
@@ -135,7 +135,7 @@
 	}
         
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+	<!-- ******************** END CK Editor related javascript & HTML ********************** -->
 
  
 </lams:head>
Index: lams_tool_eadventure/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/authoring/basic.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/authoring/basic.jsp	11 Dec 2011 21:30:38 -0000	1.3
+++ lams_tool_eadventure/web/pages/authoring/basic.jsp	14 Dec 2011 07:13:11 -0000	1.4
@@ -103,9 +103,9 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
 			</div>
-			<lams:FCKEditor id="eadventure.instructions"
+			<lams:CKEditor id="eadventure.instructions"
 				value="${formBean.eadventure.instructions}"
-				contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
+				contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
 		</td>
 	</tr>
 
Index: lams_tool_eadventure/web/pages/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/authoring/definelater.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/authoring/definelater.jsp	11 Dec 2011 21:30:38 -0000	1.3
+++ lams_tool_eadventure/web/pages/authoring/definelater.jsp	14 Dec 2011 07:13:11 -0000	1.4
@@ -38,7 +38,7 @@
         
        
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+	<!-- ******************** END CK Editor related javascript & HTML ********************** -->
 
 
 </lams:head>
Index: lams_tool_eadventure/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/authoring/pedagogicalPlannerForm.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_eadventure/web/pages/authoring/pedagogicalPlannerForm.jsp	11 Dec 2011 21:30:38 -0000	1.3
+++ lams_tool_eadventure/web/pages/authoring/pedagogicalPlannerForm.jsp	14 Dec 2011 07:13:11 -0000	1.4
@@ -59,9 +59,9 @@
   		}
   		
 	  	function prepareFormData(){
-			//FCKeditor content is not submitted when sending by jQuery; we need to do this
-			var content = FCKeditorAPI.GetInstance('instructions').GetXHTML();
-			document.getElementById("instructions").value=content;
+			//CKeditor content is not submitted when sending by jQuery; we need to do this
+			var instructions = CKEDITOR.instances.instructions.getData();
+			document.getElementById("instructions").value=instructions;
 		}
 		
 		function clearEntry(entryIndex){
@@ -80,12 +80,12 @@
 		
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.instructions"/></h4>
-		<lams:FCKEditor id="instructions"
+		<lams:CKEditor id="instructions"
 			value="${formBean.instructions}"
 			contentFolderID="${formBean.contentFolderID}"
-               toolbarSet="Custom-Pedplanner" height="150px"
-               width="750px" displayExpanded="false">
-		</lams:FCKEditor>
+               toolbarSet="CustomPedplanner" height="150px"
+               width="${param.plannerCKEditorLongWidth}" displayExpanded="false">
+		</lams:CKEditor>
 		
 		<c:if test="${formBean.itemCount ne 0}">
 			<h4 class="space-left space-top space-bottom"><fmt:message key="label.authoring.basic.resource.list.title"/></h4>
Index: lams_tool_imscc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/web.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/web/WEB-INF/web.xml	10 Dec 2011 20:51:05 -0000	1.2
+++ lams_tool_imscc/web/WEB-INF/web.xml	14 Dec 2011 07:13:04 -0000	1.3
@@ -210,13 +210,6 @@
 		    <taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
 		  </taglib>
 		<!--  ======================================================== -->	
-		<!--   FCKEditor Tag Library -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/fckeditor/FCKeditor.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
 		<!--   Customized Tag Library -->
 		<!--  ======================================================== -->	
 		<taglib>
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	14 Dec 2011 07:13:04 -0000	1.2
@@ -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;
@@ -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_imscc/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	14 Dec 2011 07:13:04 -0000	1.1
@@ -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>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/WEB-INF/tags/Passon.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/Attic/Passon.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/WEB-INF/tags/Passon.tag	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/WEB-INF/tags/Passon.tag	14 Dec 2011 07:13:04 -0000	1.2
@@ -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_imscc/web/WEB-INF/tags/TabName.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/TabName.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/WEB-INF/tags/TabName.tag	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/WEB-INF/tags/TabName.tag	14 Dec 2011 07:13:04 -0000	1.2
@@ -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_imscc/web/WEB-INF/tags/TextSearch.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/TextSearch.tag,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_imscc/web/WEB-INF/tags/TextSearch.tag	14 Dec 2011 07:13:04 -0000	1.1
@@ -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_imscc/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/WEB-INF/tags/headItems.tag	28 May 2011 18:03:35 -0000	1.1
+++ lams_tool_imscc/web/WEB-INF/tags/headItems.tag	14 Dec 2011 07:13:04 -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>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tlds/fckeditor/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	2 Jul 2011 19:31:23 -0000	1.2
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	14 Dec 2011 07:13:05 -0000	1.3
@@ -123,6 +123,26 @@
    </tag>
    <tag>
 
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -167,23 +187,14 @@
    </tag>
    <tag>
 
-      <description>Converts role name into form usable as message commonCartridge key</description>
-      <display-name>Converts role name into form usable as message commonCartridge key</display-name>
+      <description>Checks whether Flash enabled for learner</description>
+      <display-name>Checks whether Flash enabled for learner</display-name>
       <icon>    
       </icon>
-      <name>role</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <name>LearnerFlashEnabled</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
       <body-content>empty</body-content>
 
-      <attribute>
-         <description>Converts role name into form usable as message commonCartridge key</description>
-         <name>role</name>
-         <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
    </tag>
    <tag>
 
@@ -289,11 +300,6 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -436,8 +442,8 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
    	<tag-file>
        <name>AuthoringButton</name>
@@ -466,6 +472,10 @@
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
@@ -497,15 +507,15 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-    <tag>
-    	<description>Checks whether Flash enabled for learner</description>
-    	<display-name>Checks whether Flash enabled for learner</display-name>
-    	<icon>    
-    	</icon>
-    	<name>LearnerFlashEnabled</name>
-    	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-    	<body-content>empty</body-content>
-	</tag>
+  	<tag>
+	  	<description>Checks whether Flash enabled for learner</description>
+	  	<display-name>Checks whether Flash enabled for learner</display-name>
+	 	<icon>    
+	 	</icon>
+	 	<name>LearnerFlashEnabled</name>
+	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
+	 	<body-content>empty</body-content>
+ 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_imscc/web/common/fckeditorheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/common/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/common/taglibs.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/common/taglibs.jsp	28 May 2011 18:03:44 -0000	1.1
+++ lams_tool_imscc/web/common/taglibs.jsp	14 Dec 2011 07:13:05 -0000	1.2
@@ -8,5 +8,4 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="fck-editor" prefix="FCK"%>
 
Index: lams_tool_imscc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/authoring.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/web/pages/authoring/authoring.jsp	7 Jun 2011 20:58:39 -0000	1.2
+++ lams_tool_imscc/web/pages/authoring/authoring.jsp	14 Dec 2011 07:13:04 -0000	1.3
@@ -10,7 +10,6 @@
 	<title><fmt:message key="label.author.title" /></title>
 	
 	<%@ include file="/common/tabbedheader.jsp"%>
-	<%@ include file="/common/fckeditorheader.jsp"%>	
 	
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/thickbox.css'/>" />
 	
@@ -87,7 +86,7 @@
 	}
         
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+	<!-- ******************** END CK Editor related javascript & HTML ********************** -->
 
  
 </lams:head>
Index: lams_tool_imscc/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/basic.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_imscc/web/pages/authoring/basic.jsp	8 Jun 2011 12:31:16 -0000	1.3
+++ lams_tool_imscc/web/pages/authoring/basic.jsp	14 Dec 2011 07:13:04 -0000	1.4
@@ -80,9 +80,9 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
 			</div>
-			<lams:FCKEditor id="commonCartridge.instructions"
+			<lams:CKEditor id="commonCartridge.instructions"
 				value="${formBean.commonCartridge.instructions}"
-				contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
+				contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
 		</td>
 	</tr>
 
Index: lams_tool_imscc/web/pages/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/definelater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/web/pages/authoring/definelater.jsp	7 Jun 2011 20:58:39 -0000	1.2
+++ lams_tool_imscc/web/pages/authoring/definelater.jsp	14 Dec 2011 07:13:04 -0000	1.3
@@ -15,7 +15,6 @@
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
-	<%@ include file="/common/fckeditorheader.jsp"%>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 
 	<script>
@@ -40,7 +39,7 @@
         
        
     </script>
-	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+	<!-- ******************** END CK Editor related javascript & HTML ********************** -->
 
 
 </lams:head>
Index: lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp	28 May 2011 18:03:42 -0000	1.1
+++ lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp	14 Dec 2011 07:13:04 -0000	1.2
@@ -59,9 +59,9 @@
   		}
   		
 	  	function prepareFormData(){
-			//FCKeditor content is not submitted when sending by jQuery; we need to do this
-			var content = FCKeditorAPI.GetInstance('instructions').GetXHTML();
-			document.getElementById("instructions").value=content;
+			//CKeditor content is not submitted when sending by jQuery; we need to do this
+			var instructions = CKEDITOR.instances.instructions.getData();
+			document.getElementById("instructions").value=instructions;
 		}
 		
 		function clearEntry(entryIndex){
@@ -80,12 +80,12 @@
 		
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.instructions"/></h4>
-		<lams:FCKEditor id="instructions"
+		<lams:CKEditor id="instructions"
 			value="${formBean.instructions}"
 			contentFolderID="${formBean.contentFolderID}"
-               toolbarSet="Custom-Pedplanner" height="150px"
-               width="750px" displayExpanded="false">
-		</lams:FCKEditor>
+               toolbarSet="CustomPedplanner" height="150px"
+               width="${param.plannerCKEditorLongWidth}" displayExpanded="false">
+		</lams:CKEditor>
 		
 		<c:if test="${formBean.itemCount ne 0}">
 			<h4 class="space-left space-top space-bottom"><fmt:message key="label.authoring.basic.resource.list.title"/></h4>