Make toolbar definitions actually match what is available in ckeditor 3.1

3 files changed, 23 insertions, 40 deletions

diff --git a/admin/admin_ckeditor_inc.php b/admin/admin_ckeditor_inc.php
index 33ad356..3064229 100644
--- a/admin/admin_ckeditor_inc.php
+++ b/admin/admin_ckeditor_inc.php
@@ -31,7 +31,7 @@ $formToolbars = array( 'ckedit_toolbars' => array(
 );
 
 $gBitSmarty->assign( 'formToolbars', $formToolbars );
-$gBitSmarty->assign( 'formToolbarChoices', array('Basic', 'Beginner', 'Intermediate', 'Advanced', 'Supported', 'All'));
+$gBitSmarty->assign( 'formToolbarChoices', array('Basic', 'Beginner', 'Intermediate', 'Advanced', 'Supported', 'Full'));
 
 
 // Skin 
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 804e260..67358a5 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -8,8 +8,8 @@ $gBitInstaller->registerPackageInfo( CKEDITOR_PKG_NAME, array(
 ) );
 
 $gBitInstaller->registerPreferences( CKEDITOR_PKG_NAME, array(
-	array(CKEDITOR_PKG_NAME,'ckeditor_debug','n'),
-	array(CKEDITOR_PKG_NAME,'ckeditor_toolbars', 'Bitweaver'),
+	array(CKEDITOR_PKG_NAME,'ckedit_debug','n'),
+	array(CKEDITOR_PKG_NAME,'ckedit_toolbars', 'Basic'),
 ) );
 
 ?>
diff --git a/ckconfig.bitweaver.js b/ckconfig.bitweaver.js
index 15d93af..3e43b1e 100644
--- a/ckconfig.bitweaver.js
+++ b/ckconfig.bitweaver.js
@@ -5,75 +5,58 @@ CKEDITOR.editorConfig = function( config ) {
 /* Start of BITWEAVER toolbar sets */
 config.toolbar_Supported = [
 	['Source','-','Preview'],
-	['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
+	['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print','SpellChecker'],
 	['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
 	'/',
 	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
-	['OrderedList','UnorderedList','-','Outdent','Indent'],
-	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
+	['NumberedList','BulletedList','-','Outdent','Indent'],
+	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	['Link','Unlink','Anchor'],
-	['Table','Rule','Smiley','SpecialChar','PageBreak'],
+	['Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
 	'/',
-	['Style','FontFormat','FontName','FontSize'],
+	['Styles','Format','Font','FontSize'],
 	['TextColor','BGColor'],
-	['FitWindow','-','About']
+	['Maximise','ShowBlocks','-','About']
 ];
 
 config.toolbar_Beginner = [
 	['Bold','Italic','Underline'],
-	['OrderedList','UnorderedList'],
+	['NumberedList','BulletedList'],
 	['Link','Unlink','Anchor'],
-	['Table','Rule','Smiley','SpecialChar','PageBreak'],
-	['FitWindow','-','About']
+	['Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
+	['Maximise','-','About']
 ];
 
 config.toolbar_Intermediate = [
-	['Cut','Copy','Paste','PasteText','PasteWord'],
+	['Cut','Copy','Paste','PasteText','PasteFromWord'],
 	['Undo','Redo','-','Find','Replace','-','SelectAll'],
 	'/',
 	['Bold','Italic','Underline'],
-	['OrderedList','UnorderedList','-','Outdent','Indent'],
-	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
+	['NumberedList','BulletedList','-','Outdent','Indent'],
+	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	['Link','Unlink','Anchor'],
-	['Table','Rule','Smiley','SpecialChar','PageBreak'],
+	['Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
 	'/',
 	['TextColor','BGColor'],
-	['FitWindow','-','About']
+	['Maximise','-','About']
 ];
 
 config.toolbar_Advanced = [
 	['Source','-','Preview'],
-	['Cut','Copy','Paste','PasteText','PasteWord'],
+	['Cut','Copy','Paste','PasteText','PasteFromWord'],
 	['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
 	'/',
 	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
-	['OrderedList','UnorderedList','-','Outdent','Indent'],
-	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
+	['NumberedList','BulletedList','-','Outdent','Indent'],
+	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	['Link','Unlink','Anchor'],
-	['Table','Rule','Smiley','SpecialChar','PageBreak'],
+	['Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
 	'/',
-	['Style','FontFormat','FontName','FontSize'],
+	['Styles','Format','Font','FontSize'],
 	['TextColor','BGColor'],
-	['FitWindow','-','About']
+	['Maximise','ShowBlocks','-','About']
 ];
 
-config.toolbar_All = [
-	['Source','DocProps','-','Save','NewPage','Preview','-','Templates'],
-	['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
-	['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
-	['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
-	'/',
-	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
-	['OrderedList','UnorderedList','-','Outdent','Indent'],
-	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
-	['Link','Unlink','Anchor'],
-	['Image','Flash','Table','Rule','Smiley','SpecialChar','PageBreak'],
-	'/',
-	['Style','FontFormat','FontName','FontSize'],
-	['TextColor','BGColor'],
-	['FitWindow','-','About']
-] ;
-
 // to add split plugin add this to array of tools in your selected ToolbarSet
 //	['Split']
 // to add attachment plugin add this to array of tools in your selected ToolbarSet