Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -rd1b1fbdc31b8792e1cdfd0f6f60fec22d60fa414 -reee32817a235b4c88107f5c4c343ee798c498cb3
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision d1b1fbdc31b8792e1cdfd0f6f60fec22d60fa414)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision eee32817a235b4c88107f5c4c343ee798c498cb3)
@@ -63,6 +63,46 @@
   	['Format','Font','FontSize']
 ];
 
+CKEDITOR.config.toolbar_CustomWiki = [
+	['Source','-','Preview'],
+	['Undo','Redo'],
+	['Bold','Italic','Underline', '-','Subscript','Superscript'],
+	['NumberedList','BulletedList','-','Outdent','Indent'],
+	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	['wikilink','Link','Image'],
+	['Jlatexmath'],
+	['TextColor','BGColor'],
+	['Table','HorizontalRule'],
+	['Format','Font','FontSize']
+];
+
+CKEDITOR.config.toolbar_CustomWikiInline = [
+  	['Sourcedialog'],
+  	['Undo','Redo'],
+  	['Bold','Italic','Underline', '-','Subscript','Superscript'],
+  	['NumberedList','BulletedList','-','Outdent','Indent'],
+  	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+  	['wikilink','Link','Image'],
+  	['Jlatexmath'],
+  	['TextColor','BGColor'],
+  	['Table','HorizontalRule'],
+  	['Format','Font','FontSize']
+];
+
+CKEDITOR.config.toolbar_CustomWikiLearner = [
+	['Undo','Redo'],
+	['Bold','Italic','Underline', '-','Subscript','Superscript'],
+	['NumberedList','BulletedList','-','Outdent','Indent'],
+	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	['wikilink','Link','Image'],
+	['Jlatexmath'],
+	['TextColor','BGColor'],
+	['Table','HorizontalRule'],
+	['Format','Font','FontSize']
+];
+
+CKEDITOR.config.toolbar_CustomWikiLearnerInline = CKEDITOR.config.toolbar_CustomWikiLearner;
+
 CKEDITOR.config.toolbar_LessonDescription = [
     ['Bold','Italic','Underline', '-','Subscript','Superscript'],
 	['NumberedList','BulletedList','-','Outdent','Indent'],
@@ -139,7 +179,9 @@
 		
 		var anchors = tempDiv.getElementsByTagName('a');
 		for (var i = 0; i < anchors.length; i++) {
-			anchors[i].setAttribute('target', '_blank');
+			if (!anchors[i].classList.contains('skip-auto-target')) {
+				anchors[i].setAttribute('target', '_blank');
+			}
 		}
 		
 		f.data.dataValue = tempDiv.innerHTML;
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -ra906a0a0effcbe50cb7ffcb7b58f9b408d771f1d -reee32817a235b4c88107f5c4c343ee798c498cb3
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision a906a0a0effcbe50cb7ffcb7b58f9b408d771f1d)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision eee32817a235b4c88107f5c4c343ee798c498cb3)
@@ -382,7 +382,7 @@
                           </div>
                           <lams:CKEditor id="wikiBody"
                                          value="${currentWikiPage.currentWikiContentDTO.body}"
-                                         contentFolderID="${contentFolderID}" toolbarSet="DefaultLearner"
+                                         contentFolderID="${contentFolderID}" toolbarSet="CustomWikiLearner"
                                          height="400px">
                           </lams:CKEditor>
                         </td>
@@ -422,7 +422,7 @@
                             <fmt:message key="label.wiki.body"></fmt:message>
                           </div>
                           <lams:CKEditor id="newPageWikiBody" value="" height="400px"
-                                         contentFolderID="${contentFolderID}" toolbarSet="DefaultLearner">
+                                         contentFolderID="${contentFolderID}" toolbarSet="CustomWikiLearner">
                           </lams:CKEditor>
 
                           <a href="javascript:doEditOrAdd('addPage');" class="btn btn-primary pull-right voffset5"><fmt:message key="label.wiki.savechanges"></fmt:message></a> 
Index: lams_tool_wiki/web/wikilink/wikilink.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -reee32817a235b4c88107f5c4c343ee798c498cb3
--- lams_tool_wiki/web/wikilink/wikilink.js	(.../wikilink.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/wikilink/wikilink.js	(.../wikilink.js)	(revision eee32817a235b4c88107f5c4c343ee798c498cb3)
@@ -14,13 +14,12 @@
 	
 	document.getElementById("linkAliasLabel").firstChild.data = CK.lang.wikilink.WikiLinkText;
 	document.getElementById("existingLinkMenuLabel").firstChild.data = CK.lang.wikilink.WikiLinkExisting;
+
+	document.getElementById("linkAlias").value = CK.getSelection().getSelectedText();
 	
-	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]);
@@ -34,22 +33,6 @@
 }
 
 
-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)
 {
@@ -90,8 +73,8 @@
 	// workaround for FF "security feature" clearing malicious code
 	// to be inserted in contenteditable secitions
 	var escapedWikiUrl = 'mediaembedInsertData|---' + escape(wikiUrl) + '---|mediaembedInsertData';
-	CK.insertHtml( '<a href="' + escapedWikiUrl + '">' + linkAlias + '</a>' );
+	CK.insertHtml( '<a href="' + escapedWikiUrl + '" class="skip-auto-target">' + linkAlias + '</a>' );
 	var updatedEditorData = CK.getData();
-	var cleanEditorData = updatedEditorData.replace(escapedWikiUrl,wikiUrl);
+	var cleanEditorData = updatedEditorData.replace(escapedWikiUrl, wikiUrl);
 	CK.setData(cleanEditorData);
 }
\ No newline at end of file