Nachziehen der Änderungen zu CKEditor in core r4769

git-svn-id: https://svn.libreccm.org/ccm/trunk@4771 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig.java

@@ -29,7 +29,7 @@ import com.arsdigita.util.parameter.StringParameter;
  */
 public class GlossaryItemConfig extends AbstractConfig {
     private final EnumerationParameter definitionEditorType;
-    private final Parameter fckEditorConfig;
+    private final Parameter ckEditorConfig;
 
     /**
      * Enum of the types of editor that can be used.
@@ -49,13 +49,13 @@ public class GlossaryItemConfig extends AbstractConfig {
         definitionEditorType.put(EDITOR_TYPE.TEXT.name().toLowerCase(), 
                                  EDITOR_TYPE.TEXT);
 
-        fckEditorConfig = new StringParameter(
+        ckEditorConfig = new StringParameter(
             "com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config",
             Parameter.REQUIRED,
-            "/assets/fckeditor/config/fckconfig_glossaryitem.js");
+            "/assets/ckeditor/config/fckconfig_glossaryitem.js");
 
         register(definitionEditorType);
-        register(fckEditorConfig);
+        register(ckEditorConfig);
 
         loadInfo();
     }
@@ -65,6 +65,6 @@ public class GlossaryItemConfig extends AbstractConfig {
     }
     
     public final String getFckEditorConfig() {
-        return (String) get(fckEditorConfig);
+        return (String) get(ckEditorConfig);
     }
 }

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig_parameter.properties

@@ -3,7 +3,7 @@ com.arsdigita.cms.contenttypes.glossaryitem.definition.editor.purpose=Choose the
 com.arsdigita.cms.contenttypes.glossaryitem.definition.editor.example=text
 com.arsdigita.cms.contenttypes.glossaryitem.definition.editor.format=[text|wysiwyg]
 
-com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config.title=FCK Editor Config
+com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.title=CK Editor Config
-com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config.purpose=Configuration JS for the FCK Editor
+com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.purpose=Configuration JS for the FCK Editor
-com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config.example=/assets/fckeditor/config/fckconfig_glossaryitem.js
+com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.example=/assets/ckeditor/config/ckconfig_glossaryitem.js
-com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config.format=[string]
+com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.format=[string]

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemPropertyForm.java

@@ -95,7 +95,7 @@ public class GlossaryItemPropertyForm extends BasicPageForm
             definition = new CMSDHTMLEditor(DEFINITION);
             ((CMSDHTMLEditor) definition).setWrap(DHTMLEditor.SOFT);
             if (Bebop.getConfig().getDHTMLEditor()
-                                 .equals(BebopConstants.BEBOP_FCKEDITOR)) 
+                                 .equals(BebopConstants.BEBOP_CKEDITOR)) 
             {
                 ((CMSDHTMLEditor) definition).setConfig(
                     new DHTMLEditor.Config("glossaryitem", 

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemWidgetBuilder.java

@@ -47,7 +47,7 @@ public class GlossaryItemWidgetBuilder {
             definition = new CMSDHTMLEditor(DEFINITION);
             ((CMSDHTMLEditor) definition).setWrap(DHTMLEditor.SOFT);
             if (Bebop.getConfig().getDHTMLEditor()
-                                 .equals(BebopConstants.BEBOP_FCKEDITOR)) 
+                                 .equals(BebopConstants.BEBOP_CKEDITOR)) 
             {
                 ((CMSDHTMLEditor) definition).setConfig(
                     new DHTMLEditor.Config("glossaryitem", 

ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java

@@ -43,11 +43,11 @@ import java.util.GregorianCalendar;
  * Form to edit the basic properties of a <code>news item</code>. These are 
  * name, title, item date and reference code. 
  * Used by <code>NewsItemPropertiesStep</code> authoring kit step.
- * <br />
  *
  * This form can be extended to create forms for NewsItem subclasses.
  **/
-public class NewsItemPropertyForm extends BasicPageForm
+public class NewsItemPropertyForm 
+       extends BasicPageForm
        implements FormProcessListener, FormInitListener, FormSubmissionListener {
 
     private NewsItemPropertiesStep m_step;
@@ -86,12 +86,12 @@ public class NewsItemPropertyForm extends BasicPageForm
         addSubmissionListener(this);
     }
 
+    
     /**
      * Adds widgets to the form.
      */
     @Override
     protected void addWidgets() {
-
         super.addWidgets();
 
         // summary  (lead)

ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java

@@ -392,7 +392,7 @@ public class ItemSearchFolderBrowser extends Table {
             }
             // set protocol to 'other' in FCKEditor, else relative url prepended by http://
             if (Bebop.getConfig().getDHTMLEditor().equals(
-                BebopConstants.BEBOP_FCKEDITOR)) {
+                BebopConstants.BEBOP_CKEDITOR)) {
                 buffer.append(
                     " if(window.opener.document.getElementById('cmbLinkProtocol')) {\n");
                 buffer.append(

ccm-forum/src/com/arsdigita/forum/ui/PostTextStep.java

@@ -97,7 +97,7 @@ public abstract class PostTextStep extends FormStep implements Constants {
 			if (Bebop
 				.getConfig()
 				.getDHTMLEditor()
-				.equals(BebopConstants.BEBOP_FCKEDITOR)) {
+				.equals(BebopConstants.BEBOP_CKEDITOR)) {
 	
 				((DHTMLEditor) m_body).setConfig(
 					new DHTMLEditor.Config("forum", FCK_FORUM_CONFIG));