Index: lams_central/web/fckeditor/editor/fckdialog.html
===================================================================
diff -u -red376d7ba9e60ab607761599bd56dcf7eb590c47 -r90292078dc887c6ced2b067e965e0cd11cbf5431
--- lams_central/web/fckeditor/editor/fckdialog.html	(.../fckdialog.html)	(revision ed376d7ba9e60ab607761599bd56dcf7eb590c47)
+++ lams_central/web/fckeditor/editor/fckdialog.html	(.../fckdialog.html)	(revision 90292078dc887c6ced2b067e965e0cd11cbf5431)
@@ -25,7 +25,6 @@
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="robots" content="noindex, nofollow" />
-		<script language="JavaScript" type="text/javascript" src="../../includes/javascript/jquery-latest.pack.js"></script>
 		<script type="text/javascript">
 
 // On some Gecko browsers (probably over slow connections) the
Index: lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
===================================================================
diff -u -rb78d62af292ea811fa83f646cf521f0160950c93 -r90292078dc887c6ced2b067e965e0cd11cbf5431
--- lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp	(.../fck_wikilink.jsp)	(revision b78d62af292ea811fa83f646cf521f0160950c93)
+++ lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp	(.../fck_wikilink.jsp)	(revision 90292078dc887c6ced2b067e965e0cd11cbf5431)
@@ -14,157 +14,88 @@
 	width: 100%
 }
 </style>
-
+<script type="text/javascript"
+	src="../../../../includes/javascript/jquery-latest.pack.js"></script>
 <script type="text/javascript">
 <!--
 var xmlDoc;
 var wikiArray;
 var oEditor = window.parent.InnerDialogLoaded() ;
+var FCK = oEditor.FCK;
 var FCKLang = oEditor.FCKLang ;
 var FCKWikiLinks = oEditor.FCKWikiLinks ;
 
-var xmlHttp = getAjaxObject();
-xmlHttp.onreadystatechange = function() 
-{ 
-    if(xmlHttp.readyState == 4) 
-    {
-    	var xmlDoc = xmlHttp.responseXML;
+jQuery.ajax({
+    url : "<lams:LAMSURL/>/tool/lawiki10/WikiLinkHandler",
+    data : {toolSessionId: window.parent.InnerDialogLoaded().FCK.toolSessionId,
+    		sessionMapID: window.parent.InnerDialogLoaded().FCK.sessionMapID,
+    		wikiID: window.parent.InnerDialogLoaded().FCK.wikiID,
+    		method: 'getWikis'},
+    async : false, 
+    success : function(xml) {
+    	xmlDoc = xml;
     	wikiArray = xmlDoc.getElementsByTagName('Wiki');
     }
- }
+});
 
-var url="<lams:LAMSURL/>/tool/lawiki10/WikiLinkHandler?"
-	+ "&toolSessionId="+window.parent.InnerDialogLoaded().FCK.toolSessionId
-	+ "&sessionMapID="+window.parent.InnerDialogLoaded().FCK.sessionMapID
-	+ "&wikiID="+window.parent.InnerDialogLoaded().FCK.wikiID
-	+ "&method="+"getWikis";
+function init()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage( document ) ;
+	//alert('<fmt:message key="error.forgot.password.email" />');
+	
+	document.getElementById("linkAlias").value = getSelectedText();
 
-try{
-	xmlHttp.open("GET",url,false);
-	xmlHttp.send(null);
+	// Show the "Ok" button.
+	window.parent.SetOkButton( true ) ;
 }
-catch(e)
+
+function getSelectedText() 
 {
-	alert("An error occurred: " + e);
+    var selection = "";
+    if( FCK.EditorDocument.selection != null ) {
+      selection = FCK.EditorDocument.selection.createRange().text; // (Internet Explorer)
+    } 
+    else {
+      selection = oEditor.FCK.EditorWindow.getSelection(); // (FireFox) after this, won't be a string 
+      selection = "" + selection; // now a string again
+    }
+    return selection;
 }
-function addOption(dropDownMenu, wikiName, wikiURL) 
+
+function addOption(dropDownMenu, wikiName, wikiURL)
 {
 	var option = document.createElement("Option");
 	option.text = wikiName;
 	option.value = wikiURL;
 	dropDownMenu.options.add(option);
 }
 
-function init()
-{
-	// First of all, translate the dialog box texts
-	oEditor.FCKLanguageManager.TranslatePage( document ) ;
-
-	document.getElementById("newWikiLink").disabled = true;
-
-	//alert('<fmt:message key="error.forgot.password.email" />');
-	
-	// Show the "Ok" button.
-	window.parent.SetOkButton( true ) ;
-}
-
 function Ok()
 {
-	var linkText = document.getElementById('linkName').value ;
-	var existingWikiSelected = document.getElementById('existingWikiRadioButton').checked ;
-	var newWikiSelected = document.getElementById('newWikiRadioButton').checked ;
+	var str = document.getElementById('linkAlias').value ;
+	var linkAlias = str.replace(/^\s+|\s+$/g, '') ; //trim string of spaces
 	
 	var wikiUrl;
 
-	if ( linkText.length == 0 )
+	if ( linkAlias.length == 0 )
 	{
 		alert(FCKLang.WikiLinkErrNoName ) ;
 		return false ;
 	}
 	
-	if ( existingWikiSelected ) {
-		var existingWikiList = document.getElementById("existingWikiDropDownMenu");
-		wikiUrl = existingWikiList.options[existingWikiList.selectedIndex].value;
-
-		if ( wikiUrl.length == 0 )
-		{
-			alert( FCKLang.WikiLinkErrNoWiki ) ;
-			return false;
-		}
-	}
-	else if ( newWikiSelected ) 
+	var existingWikiList = document.getElementById("existingWikiDropDownMenu");
+	wikiUrl = existingWikiList.options[existingWikiList.selectedIndex].value;
+	if (existingWikiList.selectedIndex == 0 )
 	{
-		var wikiNameStr = document.getElementById("newWikiLink").value;
-		if ( wikiNameStr.length == 0 )
-		{
-			alert( FCKLang.WikiLinkErrNoWiki ) ;
-			return false;
-		}
-			
-		window.parent.jQuery.ajax({
-            url : "<lams:LAMSURL/>/tool/lawiki10/WikiLinkHandler",
-            data : {toolSessionId: window.parent.InnerDialogLoaded().FCK.toolSessionId,
-            		sessionMapID: window.parent.InnerDialogLoaded().FCK.sessionMapID,
-            		wikiID: window.parent.InnerDialogLoaded().FCK.wikiID,
-            		wikiName: wikiNameStr,
-            		method: 'createWiki'},	
-           	async : false, 
-            success : function(result) 
-            {
-            	wikiUrl = result;
-            }
-        });
+		alert( FCKLang.WikiLinkErrNoWiki ) ;
+		return false;
 	}
 	
-	FCKWikiLinks.InsertWikiLink( linkText, wikiUrl );
+	FCKWikiLinks.InsertWikiLink( linkAlias, wikiUrl );
 	return true ;
 }
 
-function enableSelection()
-{
-	var existingWikiSelected = document.getElementById('existingWikiRadioButton').checked ;
-	var newWikiSelected = document.getElementById('newWikiRadioButton').checked ;
-	
-	if ( existingWikiSelected ) {
-		document.getElementById("newWikiLink").disabled = true;
-		document.getElementById("existingWikiDropDownMenu").disabled = false;
-	}
-	else if ( newWikiSelected ) {
-		document.getElementById("existingWikiDropDownMenu").disabled = true;
-		document.getElementById("newWikiLink").disabled = false;
-	}
-}
-
-function getAjaxObject()
-{
-    var ajavObj;
-    try
-    {
-        // Firefox, Opera 8.0+, Safari
-        ajaxObj=new XMLHttpRequest();
-    }
-    catch (e)
-    {
-        // Internet Explorer
-        try
-        {
-            ajaxObj=new ActiveXObject("Msxml2.XMLHTTP");
-        }
-        catch (e)
-        {
-            try
-            {
-                ajaxObj=new ActiveXObject("Microsoft.XMLHTTP");
-            }
-            catch (e)
-            {
-                alert("Your browser does not support AJAX!");
-            }
-        }
-    }
-    return ajaxObj;
-}
-
 //-->
 </script>
 </head>
@@ -177,16 +108,15 @@
 		<table cellSpacing="3" cellPadding="3" align="center" border="0">
 			<tr>
 				<td colspan="2"><span fckLang="WikiLinkText"></span></td>
-				<td><input id="linkName" type="text"></td>
+				<td><input id="linkAlias" type="text"></td>
 			</tr>
 			<tr>
 				<td><span fckLang="WikiLinkExisting"></span></td>
-				<td><input type="radio" id="existingWikiRadioButton"
-					name="wikilinkgroup" selected="true" checked
-					onchange="enableSelection();"></td>
-				<td><select name="existingWikiDropDownMenu" id="existingWikiDropDownMenu">
-						<option value="noSelection">Please Select</option>
-						<script type='text/javascript'>
+				<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) 
@@ -197,19 +127,17 @@
 								{
 	       							var wikiName = attr.getNamedItem('name').nodeValue;
 	       							var wikiURL = attr.getNamedItem('url').nodeValue;
-	       							addOption(document.getElementById('existingWikiDropDownMenu'), wikiName, wikiURL);
-	          					}						
+	       							if (wikiName.length < 18)
+	       								addOption(document.getElementById('existingWikiDropDownMenu'), wikiName, wikiURL);
+	       							else 
+	          							addOption(document.getElementById('existingWikiDropDownMenu'), wikiName.substr(0,15) + "...", wikiURL);
+	          					}
 							}
 						//-->		
-						</script>
-				</select></td>
-			</tr>
-			<tr>
-				<td><span fckLang="WikiLinkNew"></span></td>
-				<td><input type="radio" id="newWikiRadioButton"
-					name="wikilinkgroup" onchange="enableSelection();"></td>
-				<td><input id="newWikiLink" name="newWikiLink" type="text">
+					</script>
+				</select>
 				</td>
+			</tr>
 		</table>
 		</td>
 	</tr>
Index: lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js
===================================================================
diff -u -rc688768471ebb422e6071766ea6223f52aaac442 -r90292078dc887c6ced2b067e965e0cd11cbf5431
--- lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js	(.../fckplugin.js)	(revision c688768471ebb422e6071766ea6223f52aaac442)
+++ lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js	(.../fckplugin.js)	(revision 90292078dc887c6ced2b067e965e0cd11cbf5431)
@@ -1,5 +1,5 @@
 // Register the related command.
-FCKCommands.RegisterCommand( 'WikiLink', new FCKDialogCommand( 'WikiLink', FCKLang.WikiLinkDlgTitle, FCKPlugins.Items['wikilink'].Path + 'fck_wikilink.jsp', 280, 260 ) ) ;
+FCKCommands.RegisterCommand( 'WikiLink', new FCKDialogCommand( 'WikiLink', FCKLang.WikiLinkDlgTitle, FCKPlugins.Items['wikilink'].Path + 'fck_wikilink.jsp', 280, 230 ) ) ;
 
 // Create the "WikiLink" toolbar button.
 var oWikiLinkItem = new FCKToolbarButton( 'WikiLink', FCKLang.WikiLinkBtn ) ;
@@ -10,9 +10,9 @@
 // The object used for all WikiLink operations.
 var FCKWikiLinks = new Object() ;
 
-FCKWikiLinks.InsertWikiLink = function ( linkName, wikiName )
+FCKWikiLinks.InsertWikiLink = function ( linkAlias, wikiName )
 {
-	FCK.InsertHtml( '<a href="' + wikiName + '">' + linkName + '</a>' );
+	FCK.InsertHtml( '<a href="' + wikiName + '">' + linkAlias + '</a>' );
 }
 
 
