LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Weitere old initializers entfernt. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@793 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-03-22 09:47:13 +00:00
parent b1f3f53081
commit 4587d20352
5 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccm-cms/src/com/arsdigita/cms/CMSConfig.java
View File

@ -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);
/**

14
ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js
View File

@ -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);

1
ccm-core/src/com/arsdigita/ui/admin/AdminSplitPanel.java
View File

@ -76,6 +76,7 @@ class AdminSplitPanel extends BoxPanel implements ChangeListener {
*
* @param p
*/
@Override
public void register(Page p) {
Assert.isUnlocked(this);

2
ccm-core/src/com/arsdigita/web/InternalPrefixerServlet.java
View File

@ -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,

14
ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js
View File

@ -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);