diff --git a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig.java b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig.java index da78a2fd3..a6c684fff 100644 --- a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig.java +++ b/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); } } diff --git a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig_parameter.properties b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig_parameter.properties index 1a3785a8c..fdd1ed47b 100644 --- a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig_parameter.properties +++ b/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.fck_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.fck_editor_config.format=[string] +com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.title=CK Editor Config +com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.purpose=Configuration JS for the FCK Editor +com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.example=/assets/ckeditor/config/ckconfig_glossaryitem.js +com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.format=[string] diff --git a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemPropertyForm.java b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemPropertyForm.java index 47c044b99..a85abfe26 100755 --- a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemPropertyForm.java +++ b/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", diff --git a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemWidgetBuilder.java b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemWidgetBuilder.java index c6d106a92..e24b7c86b 100644 --- a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemWidgetBuilder.java +++ b/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", diff --git a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java index e1d3ba781..2e24198d3 100755 --- a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java +++ b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java @@ -43,12 +43,12 @@ import java.util.GregorianCalendar; * Form to edit the basic properties of a news item. These are * name, title, item date and reference code. * Used by NewsItemPropertiesStep authoring kit step. - *
* * This form can be extended to create forms for NewsItem subclasses. **/ -public class NewsItemPropertyForm extends BasicPageForm - implements FormProcessListener, FormInitListener, FormSubmissionListener { +public class NewsItemPropertyForm + extends BasicPageForm + implements FormProcessListener, FormInitListener, FormSubmissionListener { private NewsItemPropertiesStep m_step; /** lead parameter name */ @@ -86,17 +86,17 @@ public class NewsItemPropertyForm extends BasicPageForm addSubmissionListener(this); } + /** * Adds widgets to the form. */ @Override protected void addWidgets() { - super.addWidgets(); // summary (lead) - // add(new Label(NewsItemGlobalizationUtil - // .globalize("cms.contenttypes.ui.newsitem.lead"))); + // add(new Label(NewsItemGlobalizationUtil + // .globalize("cms.contenttypes.ui.newsitem.lead"))); ParameterModel leadParam = new StringParameter(LEAD); //leadParam // .addParameterListener(new NotNullValidationListener()); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java index 948483f55..1e9ee80cc 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java +++ b/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( diff --git a/ccm-forum/src/com/arsdigita/forum/ui/PostTextStep.java b/ccm-forum/src/com/arsdigita/forum/ui/PostTextStep.java index de5f7e45b..c9343df65 100644 --- a/ccm-forum/src/com/arsdigita/forum/ui/PostTextStep.java +++ b/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));