Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r0a0d57ab1d0c6cd52921c132667b25e93082662b
--- lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 0a0d57ab1d0c6cd52921c132667b25e93082662b)
@@ -33,6 +33,21 @@
 </c:if>
 
 <script type="text/javascript">
+
+	/* Beacuse we're using Prototype, jQuery and CKEditor, some situations
+	   are impossible to resolve without manually rewritting functions
+	   
+	CKEDITOR.tools.indexOf = function( array, entry ) 
+	{ 
+		for ( var i = 0, len = array.length ; i < len ; i++ ) 
+		{ 
+			if ( array[ i ] == entry ) 
+				return i; 
+		} 
+		return -1; 
+	};
+	
+	*/
 	CKEDITOR.basePath = "${ckEditorBasePath}";
 	
 	CKEDITOR.replace( "${id}", {
Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -rc352d6861383e37a31d084af5b630a57a646f5e2 -r0a0d57ab1d0c6cd52921c132667b25e93082662b
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision c352d6861383e37a31d084af5b630a57a646f5e2)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 0a0d57ab1d0c6cd52921c132667b25e93082662b)
@@ -30,7 +30,7 @@
 
 CKEDITOR.config.toolbar_CustomPedplanner = [
 					      ['Source','-','FitWindow','Preview','PasteWord','Bold','Italic','Underline', '-','OrderedList','UnorderedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','TextColor','BGColor','Equation'], 
-	['Image','Link','Table','Smiley','FontName','FontSize']
+	['Image','Link','Table','Smiley','FontName','FontSize','WikiLink']
 ] ;
 
 
@@ -46,5 +46,6 @@
 // CKEDITOR.plugins.add('movieplayer') ;
 // CKEDITOR.plugins.add('videorecorder') ;
 // CKEDITOR.plugins.add('paint') ;
-// CKEDITOR.plugins.addExternal('wikilink', CKEDITOR.basePath + '../tool/lawiki10/') ;
-// CKEDITOR.config.extraPlugins = 'equation,movieplayer,videorecorder,paint,wikilink' ;
\ No newline at end of file
+CKEDITOR.plugins.addExternal('WikiLink', CKEDITOR.basePath + '../tool/lawiki10/wikilink/', 'plugin.js') ;
+//CKEDITOR.config.extraPlugins = 'equation,movieplayer,videorecorder,paint,wikilink' ;
+CKEDITOR.config.extraPlugins = 'WikiLink' ;
\ No newline at end of file
Fisheye: Tag 0a0d57ab1d0c6cd52921c132667b25e93082662b refers to a dead (removed) revision in file `lams_tool_wiki/web/wikilink/fck_wikilink.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0a0d57ab1d0c6cd52921c132667b25e93082662b refers to a dead (removed) revision in file `lams_tool_wiki/web/wikilink/fckplugin.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/web/wikilink/lang/en.js
===================================================================
diff -u -rc6e94daca0503c86d05e4b9ca41b86193481e982 -r0a0d57ab1d0c6cd52921c132667b25e93082662b
--- lams_tool_wiki/web/wikilink/lang/en.js	(.../en.js)	(revision c6e94daca0503c86d05e4b9ca41b86193481e982)
+++ lams_tool_wiki/web/wikilink/lang/en.js	(.../en.js)	(revision 0a0d57ab1d0c6cd52921c132667b25e93082662b)
@@ -1,7 +1,13 @@
-FCKLang.WikiLinkBtn			= 'Insert/Edit Wiki Link' ;
-FCKLang.WikiLinkToolTip		= 'Insert or edit a link to a Wiki page' ;
-FCKLang.WikiLinkText		= 'Link Alias:' ;
-FCKLang.WikiLinkExisting	= 'Wiki Page:' ;
-FCKLang.WikiLinkErrNoName	= 'Please enter the Link Alias' ;
-FCKLang.WikiLinkErrNoWiki 	= 'Please specify which Wiki you would like to link to' ;
-
+CKEDITOR.plugins.setLang( 'WikiLink', 'en',
+	    {
+	        wikilink :
+	        {
+				WikiLinkBtn			: 'Insert/Edit Wiki Link' ,
+				WikiLinkToolTip		: 'Insert or edit a link to a Wiki page' ,
+				WikiLinkText		: 'Link Alias:' ,
+				WikiLinkExisting	: 'Wiki Page:' ,
+				WikiLinkErrNoName	: 'Please enter the Link Alias' ,
+				WikiLinkErrNoWiki 	: 'Please specify which Wiki you would like to link to'
+	        }
+	    }
+	);
\ No newline at end of file
Index: lams_tool_wiki/web/wikilink/plugin.js
===================================================================
diff -u
--- lams_tool_wiki/web/wikilink/plugin.js	(revision 0)
+++ lams_tool_wiki/web/wikilink/plugin.js	(revision 0a0d57ab1d0c6cd52921c132667b25e93082662b)
@@ -0,0 +1,34 @@
+CKEDITOR.plugins.add('WikiLink',
+       {
+          requires : ['iframedialog'],
+		  lang : [ 'en' ],
+          init : function(editor) {
+             var pluginPath = CKEDITOR.plugins.getPath('WikiLink');
+             
+             editor.ui.addButton(
+                'WikiLink',
+                {
+                   label : "WikiLink",
+                   command : 'WikiLink',
+                   icon : pluginPath + 'wikilink.gif',
+                   title : editor.lang.wikilink.WikiLinkToolTip
+                }
+             );
+             var current = editor.name;
+             var cmd = editor.addCommand('WikiLink', {exec:showDialogPlugin});
+             CKEDITOR.dialog.addIframe(
+                'WikiLink',
+                'WikiLink',
+                pluginPath + 'wikilink.jsp',
+                280,
+                230,
+                function(){
+                }
+             );
+          }
+       }
+    );
+
+function showDialogPlugin(e){
+	e.openDialog('WikiLink');
+}
Index: lams_tool_wiki/web/wikilink/wikilink.js
===================================================================
diff -u
--- lams_tool_wiki/web/wikilink/wikilink.js	(revision 0)
+++ lams_tool_wiki/web/wikilink/wikilink.js	(revision 0a0d57ab1d0c6cd52921c132667b25e93082662b)
@@ -0,0 +1,91 @@
+var xmlDoc;
+var wikiArray;
+var CKGlobal = window.parent.CKEDITOR;
+var thisDialog = CKGlobal.dialog.getCurrent();
+var CK = thisDialog.getParentEditor();
+// Get the array of possible wiki links from the opening window
+wikiArray = window.parent.wikiLinkArray;
+
+function init()
+{
+	// No need or possibility to do that in CKEditor 3
+	// oEditor.FCKLanguageManager.TranslatePage( document ) ;
+	// but we need to do this instead
+	
+	document.getElementById("linkAliasLabel").firstChild.data = CK.lang.wikilink.WikiLinkText;
+	document.getElementById("existingLinkMenuLabel").firstChild.data = CK.lang.wikilink.WikiLinkExisting;
+	
+	document.getElementById("linkAlias").value = getSelectedText();
+	
+	// remove our previously registered listeners and reregister a new one
+	var okButton = thisDialog.getButton('ok');
+	var newListeners = [];
+	var oldListeners = okButton._.events.click.listeners;
+	for (var i = 0; i < okButton._.events.click.listeners.length; i++){
+		if (okButton._.events.click.listeners[i].priority != 1) {
+			newListeners.push(okButton._.events.click.listeners[i]);
+		}
+	}
+	okButton._.events.click.listeners = newListeners;
+	okButton.on('click', triggerOK, null, null, 1);
+		
+	// Show the "Ok" button - doesn't work in CKEditor 3, but shouldn't cause problems
+	// window.parent.SetOkButton( true ) ;
+}
+
+
+function getSelectedText() 
+{
+    var selection = "";
+    var CKSelection = CK.getSelection();
+    if( CKGlobal.env.ie ) {
+    	// doesn't work otherwise
+    	CKSelection.unlock(true);
+    	selection = CKSelection.getNative().createRange().text; // (Internet Explorer)
+    } 
+    else {
+    
+      selection = CKSelection.getNative(); // (FireFox) after this, won't be a string 
+      selection = "" + selection; // now a string again
+    }
+    return selection;
+}
+
+function addOption(dropDownMenu, wikiName, wikiURL)
+{
+	var option = document.createElement("Option");
+	option.text = wikiName;
+	option.value = wikiURL;
+	dropDownMenu.options.add(option);
+}
+
+function prettyWikiLink(wikiLink)
+{
+	return wikiLink.replace("`", "'").replace("&quot;", '"');
+}
+
+function triggerOK(ev)
+{
+	var str = document.getElementById('linkAlias').value ;
+	var linkAlias = str.replace(/^\s+|\s+$/g, '') ; // trim string of spaces
+	
+	var wikiUrl;
+
+	if ( linkAlias.length == 0 )
+	{
+		alert(CK.lang.wikilink.WikiLinkErrNoName ) ;
+		ev.stop();
+		return;
+	}
+	
+	var existingWikiList = document.getElementById("existingWikiDropDownMenu");
+	wikiUrl = existingWikiList.options[existingWikiList.selectedIndex].value;
+	if (existingWikiList.selectedIndex == 0 )
+	{
+		alert( CK.lang.wikilink.WikiLinkErrNoWiki ) ;
+		ev.stop();
+		return;
+	}
+	
+	CK.insertHtml( '<a href="' + wikiUrl + '">' + linkAlias + '</a>' );
+}
\ No newline at end of file
Index: lams_tool_wiki/web/wikilink/wikilink.jsp
===================================================================
diff -u
--- lams_tool_wiki/web/wikilink/wikilink.jsp	(revision 0)
+++ lams_tool_wiki/web/wikilink/wikilink.jsp	(revision 0a0d57ab1d0c6cd52921c132667b25e93082662b)
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<%@ page language="java" pageEncoding="UTF-8"
+	contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta content="noindex, nofollow" name="robots">
+<style type="text/css">
+select {
+	width: 100%
+}
+</style>
+<script type="text/javascript" src="wikilink.js"></script>
+</head>
+<body scroll="no" style="OVERFLOW: hidden" onload="init()">
+<form name="wikiform" action="">
+<table height="100%" cellSpacing="0" cellPadding="0" width="100%"
+	border="0">
+	<tr>
+		<td>
+		<table cellSpacing="3" cellPadding="3" align="center" border="0">
+			<tr>
+				<td colspan="2"><span id="linkAliasLabel">&nbsp;</span></td>
+				<td><input id="linkAlias" type="text"></td>
+			</tr>
+			<tr>
+				<td><span id="existingLinkMenuLabel">&nbsp;</span></td>
+				<td></td>
+				<td><select name="existingWikiDropDownMenu"
+					id="existingWikiDropDownMenu">
+					<option value="noSelection">Please Select</option>
+					<script type="text/javascript">
+						<!--
+							var i;
+							for (i=0; i<wikiArray.length; ++i) 
+							{	
+								var wikiURL="javascript:changeWikiPage(&quot;" + wikiArray[i] + "&quot;)";
+								addOption(document.getElementById('existingWikiDropDownMenu'), prettyWikiLink(wikiArray[i]), wikiURL);
+							}
+						//-->		
+					</script>
+				</select>
+				</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+</form>
+</body>
+</html>