Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/ckconfig_custom.js,v
diff -u -r1.19.2.8 -r1.19.2.9
--- lams_central/web/includes/javascript/ckconfig_custom.js	4 Nov 2015 12:36:59 -0000	1.19.2.8
+++ lams_central/web/includes/javascript/ckconfig_custom.js	4 May 2016 01:44:52 -0000	1.19.2.9
@@ -1,7 +1,16 @@
+// The Inline versions are the default with the inline CKEditor.tag. If using the old (replace) version of the tag then then the non-inline ones are used.
+// Main difference Source became Sourcedialog and Maximize and Preview were dropped.
+
 CKEDITOR.config.toolbar_Default = [
 	['Source','-','Maximize', 'Preview','PasteFromWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath','-'], 
 	['Paint_Button','oembed','Kaltura','Image','Link','Iframe','Table','HorizontalRule','Smiley','SpecialChar','Templates','Format','Font','FontSize','About']
 ];
+
+CKEDITOR.config.toolbar_DefaultInline = [
+	['Sourcedialog','-','PasteFromWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath','-'], 
+    ['Paint_Button','oembed','Kaltura','Image','Link','Iframe','Table','HorizontalRule','Smiley','SpecialChar','Templates','Format','Font','FontSize','About']
+];
+
 // removing Video Recorder from default tool bar LDEV-2961
 // To include it back, just add 'VideoRecorder' in between the MoviePlayer and Kaltura
 
@@ -17,6 +26,18 @@
 	['Format','Font','FontSize']
 ];
 
+CKEDITOR.config.toolbar_DefaultLearnerInline = [
+  	['PasteFromWord'],
+  	['Undo','Redo'],
+  	['Bold','Italic','Underline', '-','Subscript','Superscript'],
+  	['NumberedList','BulletedList','-','Outdent','Indent'],
+  	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+  	['Jlatexmath','About'],
+  	['TextColor','BGColor'],
+  	['Image','Table','HorizontalRule','Smiley','SpecialChar'],
+  	['Format','Font','FontSize']
+  ];
+
 CKEDITOR.config.toolbar_DefaultMonitor = [
 	['Preview','PasteFromWord'],
 	['Undo','Redo'],
@@ -29,6 +50,18 @@
 	['Format','Font','FontSize']
 ];
 
+CKEDITOR.config.toolbar_DefaultMonitorInline = [
+  	['PasteFromWord'],
+  	['Undo','Redo'],
+  	['Bold','Italic','Underline', '-','Subscript','Superscript'],
+  	['NumberedList','BulletedList','-','Outdent','Indent'],
+  	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+  	['Jlatexmath','About'],
+  	['TextColor','BGColor'],
+  	['Table','HorizontalRule','Smiley','SpecialChar'],
+  	['Format','Font','FontSize']
+];
+
 CKEDITOR.config.toolbar_CustomWiki = [
 	['Source','-','Preview','PasteFromWord'],
 	['Undo','Redo'],
@@ -42,11 +75,30 @@
 	['Format','Font','FontSize']
 ];
 
+CKEDITOR.config.toolbar_CustomWikiInline = [
+  	['Sourcedialog','-','PasteFromWord'],
+  	['Undo','Redo'],
+  	['Bold','Italic','Underline', '-','Subscript','Superscript'],
+  	['NumberedList','BulletedList','-','Outdent','Indent'],
+  	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+  	['wikilink','Link','Image'],
+  	['Jlatexmath','About'],
+  	['TextColor','BGColor'],
+  	['Table','HorizontalRule','Smiley','SpecialChar'],
+  	['Format','Font','FontSize']
+];
+
+
 CKEDITOR.config.toolbar_CustomPedplanner = [
 	['Source','-','Maximize','Preview','PasteFromWord','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath'], 
 	['Image','Link','Iframe','Table','Smiley','Font','FontSize']
 ];
 
+CKEDITOR.config.toolbar_CustomPedplannerInline = [
+	['Sourcedialog','-','PasteFromWord','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath'], 
+	['Image','Link','Iframe','Table','Smiley','Font','FontSize']
+];
+
 CKEDITOR.config.toolbar_LessonDescription = [
     ['Bold','Italic','Underline', '-','Subscript','Superscript'],
 	['NumberedList','BulletedList','-','Outdent','Indent'],
@@ -56,7 +108,16 @@
 	['Format','Font','FontSize']
 ];
 
+CKEDITOR.config.toolbar_LessonDescriptionInline = [
+    ['Bold','Italic','Underline', '-','Subscript','Superscript'],
+ 	['NumberedList','BulletedList','-','Outdent','Indent'],
+ 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+ 	['TextColor','BGColor'],
+ 	['Table','HorizontalRule','Smiley','SpecialChar'],
+ 	['Format','Font','FontSize']
+ ];
 
+
 CKEDITOR.config.contentsCss = CKEDITOR.basePath + '../css/defaultHTML_learner.css';
 //CKEDITOR.config.skin = 'office2013' ;
 CKEDITOR.config.disableNativeSpellChecker = false;
@@ -65,7 +126,7 @@
 CKEDITOR.config.format_tags	= 'div;h1;h2;h3;h4;h5;h6;pre;address;p' ;
 CKEDITOR.config.enterMode = 'div';
 CKEDITOR.plugins.addExternal('wikilink', CKEDITOR.basePath + '../tool/lawiki10/wikilink/', 'plugin.js');
-CKEDITOR.config.extraPlugins = 'kaltura,wikilink,jlatexmath,paint,iframe,lineutils,widget,oembed';
+CKEDITOR.config.extraPlugins = 'kaltura,wikilink,jlatexmath,paint,iframe,lineutils,widget,oembed,sourcedialog';
 CKEDITOR.config.enterMode = CKEDITOR.ENTER_DIV; 
 CKEDITOR.config.removePlugins = 'elementspath';
 CKEDITOR.config.allowedContent = true;