From 4587d2035265fb54347ca06605f051cbb6b4b896 Mon Sep 17 00:00:00 2001 From: pb Date: Tue, 22 Mar 2011 09:47:13 +0000 Subject: [PATCH] Weitere old initializers entfernt. git-svn-id: https://svn.libreccm.org/ccm/trunk@793 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms/src/com/arsdigita/cms/CMSConfig.java | 13 ++++++++----- ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js | 14 ++++++++++++++ .../com/arsdigita/ui/admin/AdminSplitPanel.java | 1 + .../com/arsdigita/web/InternalPrefixerServlet.java | 2 ++ ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js | 14 ++++++++++++++ 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java index c975508ca..41ff0b2b8 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java +++ b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java @@ -174,10 +174,12 @@ public final class CMSConfig extends AbstractConfig { * DHTML Editor Configuration for use in CMS module, lists the * config object name and Javascript source location for its definition. */ - private final Parameter m_dhtmlEditorConfig = new DHTMLEditorConfigParameter("com.arsdigita.cms.dhtml_editor_config", - Parameter.REQUIRED, - new DHTMLEditor.Config("XinhaConfig", - "/assets/xinha/CCMcmsXinhaConfig.js")); + private final Parameter m_dhtmlEditorConfig = + new DHTMLEditorConfigParameter( + "com.arsdigita.cms.dhtml_editor_config", + Parameter.REQUIRED, + new DHTMLEditor.Config("XinhaConfig", + "/assets/xinha/CCMcmsXinhaConfig.js")); // previous parameter definition: // > DHTMLEditor.Config.STANDARD); < // didn't work because of broken unmarshalling (cf. similiar problem @@ -192,7 +194,8 @@ public final class CMSConfig extends AbstractConfig { * Defines which plugins to use, e.g.TableOperations,CSS * Format: [string,string,string] */ - private final Parameter m_dhtmlEditorPlugins = new StringArrayParameter("com.arsdigita.cms.dhtml_editor_plugins", + private final Parameter m_dhtmlEditorPlugins = new StringArrayParameter( + "com.arsdigita.cms.dhtml_editor_plugins", Parameter.OPTIONAL, null); /** diff --git a/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js b/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js index 040eab53d..af6d40f7f 100644 --- a/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js +++ b/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js @@ -14,6 +14,20 @@ if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){ return; } xinha_config=xinha_config?xinha_config():new Xinha.Config(); + //this is the standard toolbar for CCM, feel free to remove buttons as you like + xinha_config.toolbar = + [ + ["popupeditor"], + ["separator","formatblock","bold","italic","underline","strikethrough"], + ["separator","subscript","superscript"], + ["separator","justifyleft","justifycenter","justifyright","justifyfull"], + ["separator","insertorderedlist","insertunorderedlist","outdent","indent"], + ["separator","inserthorizontalrule","createlink"], + ["separator","undo","redo","selectall"], (Xinha.is_gecko ? [] : ["cut","copy","paste","overwrite"]), + ["separator","clearfonts","removeformat"], + ["separator","htmlmode","showhelp","about"] + ]; + xinha_config.pageStyleSheets=[_editor_url+"examples/full_example.css"]; xinha_editors=Xinha.makeEditors(xinha_editors,xinha_config,xinha_plugins); Xinha.startEditors(xinha_editors); diff --git a/ccm-core/src/com/arsdigita/ui/admin/AdminSplitPanel.java b/ccm-core/src/com/arsdigita/ui/admin/AdminSplitPanel.java index 4062f4cb2..eb181f395 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/AdminSplitPanel.java +++ b/ccm-core/src/com/arsdigita/ui/admin/AdminSplitPanel.java @@ -76,6 +76,7 @@ class AdminSplitPanel extends BoxPanel implements ChangeListener { * * @param p */ + @Override public void register(Page p) { Assert.isUnlocked(this); diff --git a/ccm-core/src/com/arsdigita/web/InternalPrefixerServlet.java b/ccm-core/src/com/arsdigita/web/InternalPrefixerServlet.java index 8ad91d73c..f390ea13f 100755 --- a/ccm-core/src/com/arsdigita/web/InternalPrefixerServlet.java +++ b/ccm-core/src/com/arsdigita/web/InternalPrefixerServlet.java @@ -68,6 +68,7 @@ public class InternalPrefixerServlet extends HttpServlet { private String m_prefix; + @Override public void init() throws ServletException { ServletConfig conf = getServletConfig(); @@ -79,6 +80,7 @@ public class InternalPrefixerServlet extends HttpServlet { } } + @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, diff --git a/ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js b/ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js index 040eab53d..af6d40f7f 100644 --- a/ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js +++ b/ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js @@ -14,6 +14,20 @@ if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){ return; } xinha_config=xinha_config?xinha_config():new Xinha.Config(); + //this is the standard toolbar for CCM, feel free to remove buttons as you like + xinha_config.toolbar = + [ + ["popupeditor"], + ["separator","formatblock","bold","italic","underline","strikethrough"], + ["separator","subscript","superscript"], + ["separator","justifyleft","justifycenter","justifyright","justifyfull"], + ["separator","insertorderedlist","insertunorderedlist","outdent","indent"], + ["separator","inserthorizontalrule","createlink"], + ["separator","undo","redo","selectall"], (Xinha.is_gecko ? [] : ["cut","copy","paste","overwrite"]), + ["separator","clearfonts","removeformat"], + ["separator","htmlmode","showhelp","about"] + ]; + xinha_config.pageStyleSheets=[_editor_url+"examples/full_example.css"]; xinha_editors=Xinha.makeEditors(xinha_editors,xinha_config,xinha_plugins); Xinha.startEditors(xinha_editors);