Fixed: Distinguish between Teaser and page break

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 965c465..ee2f06d 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ $Id$
 -- 2008-11-19 version 6.x-2.x-dev
 * #323170 Fixed: unclear notifications on the status page (You are using a feature...)
 * #334947 Added LoginToboggan administration pages to the default exclusion list
+* #322939 Fixed: Distinguish between Teaser and page break
 
 -- 2008-11-14 version 6.x-2.x-dev
 * #332727 Fixed: Fatal error in PHP4 

diff --git a/fckeditor.config.js b/fckeditor.config.js
index bd956bc..ce9dd68 100644 (file)
--- a/fckeditor.config.js
+++ b/fckeditor.config.js
@@ -14,9 +14,9 @@
 
 //uncomment these three lines to enable teaser break and page break plugins
 //remember to add 'DrupalBreak' and 'DrupalPageBreak' buttons to the toolbar
-FCKConfig.Plugins.Add( 'drupalbreak' ) ;
+FCKConfig.Plugins.Add( 'drupalbreak', 'en' ) ;
 FCKConfig.Plugins.Add( 'imgassist' ) ;
-//FCKConfig.Plugins.Add( 'drupalpagebreak' ) ;
+//FCKConfig.Plugins.Add( 'drupalpagebreak', 'en' ) ;
 
 /*
  This toolbar is dedicated to users with "Full HTML" access
@@ -87,4 +87,4 @@ FCKConfig.IndentClasses = ['rteindent1','rteindent2','rteindent3','rteindent4']
 // [ Left, Center, Right, Justified ]
 FCKConfig.JustifyClasses = ['rteleft','rtecenter','rteright','rtejustify'] ;
 //Set to 'encode' if you want to obfuscate emails with javascript
-FCKConfig.EMailProtection = 'none' ;
\ No newline at end of file
+FCKConfig.EMailProtection = 'none' ;

diff --git a/plugins/drupalbreak/fckplugin.js b/plugins/drupalbreak/fckplugin.js
index efb9cd6..0b0aa70 100644 (file)
--- a/plugins/drupalbreak/fckplugin.js
+++ b/plugins/drupalbreak/fckplugin.js
@@ -139,7 +139,7 @@ FCKDrupalBreak.prototype.GetState = function()
 // Register the Drupal tag commands.
 FCKCommands.RegisterCommand( 'DrupalBreak', new FCKDrupalBreak( 'Break' ) ) ;
 // Create the Drupal tag buttons.
-var oDrupalItem = new FCKToolbarButton( 'DrupalBreak', 'Break', null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
+var oDrupalItem = new FCKToolbarButton( 'DrupalBreak', 'Teaser', FCKLang.DrupalBreakTitle, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
 oDrupalItem.IconPath = FCKConfig.PluginsPath + 'drupalbreak/drupalbreak.gif';
 FCKToolbarItems.RegisterItem( 'DrupalBreak', oDrupalItem ) ;
 

diff --git a/plugins/drupalpagebreak/fckplugin.js b/plugins/drupalpagebreak/fckplugin.js
index c281f57..0c92fe1 100644 (file)
--- a/plugins/drupalpagebreak/fckplugin.js
+++ b/plugins/drupalpagebreak/fckplugin.js
@@ -122,7 +122,7 @@ FCKDrupalPageBreak.prototype.GetState = function()
 // Register the Drupal tag commands.
 FCKCommands.RegisterCommand( 'DrupalPageBreak', new FCKDrupalPageBreak( 'Break' ) ) ;
 // Create the Drupal tag buttons.
-var oDrupalItem = new FCKToolbarButton( 'DrupalPageBreak', 'Break', null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
+var oDrupalItem = new FCKToolbarButton( 'DrupalPageBreak', 'Page', FCKLang.DrupalPageBreakTitle, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
 oDrupalItem.IconPath = FCKConfig.PluginsPath + 'drupalpagebreak/drupalpagebreak.gif';
 FCKToolbarItems.RegisterItem( 'DrupalPageBreak', oDrupalItem ) ;
 

diff --git a/plugins/drupalpagebreak/lang/en.js b/plugins/drupalpagebreak/lang/en.js
index a2e6ac3..4a86ed5 100644 (file)
--- a/plugins/drupalpagebreak/lang/en.js
+++ b/plugins/drupalpagebreak/lang/en.js
@@ -1 +1 @@
-FCKLang.DrupalBreakTitle = 'Insert Teaser Break' ;
+FCKLang.DrupalPageBreakTitle = 'Insert Page Break' ;