Author: bpapez
Date: Thu Sep 13 15:58:47 2007
New Revision: 18435
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18435&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2065
* more features to link CSS files and the styles-XML file to the editor bas=
ed on the context
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaF=
ieldDefinitionProperties.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Htm=
lEditorsViewHelper.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/HtmlEditorCSS.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/JahiaHtmlEditorsDigester.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/JahiaHtmlEditorsFactory.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/htmleditors/ht=
mleditors_config.xml
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/jahi=
a.css
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/ekit=
/ekit_htmleditor.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o3/mac.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o3/no_mac.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o4/main.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke=
ditor/fckeditor_htmleditor.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaFieldDefinitionProperties.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaFieldDefinitionProperties.=
java&rev=3D18435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaF=
ieldDefinitionProperties.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaF=
ieldDefinitionProperties.java Thu Sep 13 15:58:47 2007
@@ -31,4 +31,9 @@
*/
public static final String FIELD_MULTILINE_SMALLTEXT_PROP =3D "field_m=
ultiline_smalltext_prop"; =
=
+ /**
+ * This property can be used for BigText fields. You can set the ID of=
a stylesheet and =
+ * a style definition description configured in htmleditors_config.xml =
+ */
+ public static final String FIELD_STYLESHEET_ID_PROP =3D "field_stylesh=
eet_id_prop"; =
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/HtmlEditorsViewHelper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/HtmlEditorsViewHelper.java&r=
ev=3D18435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Htm=
lEditorsViewHelper.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Htm=
lEditorsViewHelper.java Thu Sep 13 15:58:47 2007
@@ -18,10 +18,7 @@
=
package org.jahia.engines.shared;
=
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import javax.servlet.http.HttpServletRequest;
+import java.util.*;
=
import org.jahia.exceptions.JahiaException;
import org.jahia.registries.ServicesRegistry;
@@ -31,8 +28,6 @@
import org.jahia.services.htmleditors.JahiaClientCapabilities;
import org.jahia.params.ProcessingContext;
=
-import java.util.ArrayList;
-import java.util.Vector;
import java.io.Serializable;
=
/**
@@ -47,14 +42,14 @@
=
private Hashtable editors;
private Vector editorList;
- private Hashtable enabledCSSs;
+ private Map enabledCSSs;
private String defaultEditor;
private String defaultCSS;
=
public HtmlEditorsViewHelper(){
this.editors =3D new Hashtable();
this.editorList =3D new Vector();
- this.enabledCSSs =3D new Hashtable();
+ this.enabledCSSs =3D new LinkedHashMap();
this.defaultEditor =3D "";
this.defaultCSS =3D "";
}
@@ -67,7 +62,7 @@
public HtmlEditorsViewHelper(String defaultEditor){
this.editors =3D new Hashtable();
this.editorList =3D new Vector();
- this.enabledCSSs =3D new Hashtable();
+ this.enabledCSSs =3D new LinkedHashMap();
this.defaultEditor =3D defaultEditor;
}
=
@@ -160,7 +155,7 @@
*
* @return the list of enabled CSS.
*/
- public Hashtable getEnabledCSSs(){
+ public Map getEnabledCSSs(){
return this.enabledCSSs;
}
/**
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htm=
leditors/HtmlEditorCSS.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/htmleditors/HtmlEditorCSS.java&rev=
=3D18435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/HtmlEditorCSS.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/HtmlEditorCSS.java Thu Sep 13 15:58:47 2007
@@ -19,6 +19,7 @@
package org.jahia.services.htmleditors;
=
import java.util.Collection;
+import java.util.Iterator;
import java.util.Set;
import java.util.HashSet;
import java.io.Serializable;
@@ -37,8 +38,10 @@
private String id;
private String name;
private String url;
+ private String stylesDef;
private boolean shared; // shared to all sites
private Set allowedSites =3D new HashSet();
+ private Set allowedTemplateSets =3D new HashSet();
=
/**
*
@@ -47,11 +50,12 @@
* @param url
* @param shared
*/
- public HtmlEditorCSS(String id, String name, String url, boolean share=
d){
+ public HtmlEditorCSS(String id, String name, String url, String styles=
Def, boolean shared){
this.id =3D id;
this.name =3D name;
this.url =3D url;
this.shared =3D shared;
+ this.stylesDef =3D stylesDef;
}
=
/**
@@ -82,6 +86,15 @@
}
=
/**
+ * Returns the CSS styles def XML filename
+ *
+ * @return the CSS styles def XML filename
+ */
+ public String getStylesDef(){
+ return this.stylesDef;
+ } =
+ =
+ /**
* Returns true if shared with all sites
*
*/
@@ -108,6 +121,26 @@
this.allowedSites.addAll(sites);
}
}
+ =
+ /**
+ * Add a site to the allowed site list
+ */
+ public void addAllowedTemplatesSet(String templateRoot){
+ if ( templateRoot !=3D null ){
+ this.allowedTemplateSets.add(templateRoot);
+ }
+ }
+
+ /**
+ * Add a set of allowed site
+ *
+ * @param sites
+ */
+ public void addAllowedTemplateSets(Collection templateRoots){
+ if ( templateRoots !=3D null ){
+ this.allowedTemplateSets.addAll(templateRoots);
+ }
+ } =
=
/**
* Returns true if a site is allowed to use this CSS
@@ -116,6 +149,25 @@
return ( this.isShared()
|| ( siteKey !=3D null && this.allowedSites.contains(site=
Key) ) );
}
+ =
+ /**
+ * Returns true if a site is allowed to use this CSS
+ */
+ public boolean isTemplateAllowed(String templatePath){
+ boolean templateAllowed =3D false;
+ if (allowedTemplateSets.isEmpty() || templatePath =3D=3D null || t=
emplatePath.length() =3D=3D 0) {
+ templateAllowed =3D true;
+ } else {
+ for (Iterator it =3D allowedTemplateSets.iterator(); it.hasNex=
t() && !templateAllowed; ) {
+ String templateRootName =3D (String)it.next();
+ if (templatePath.indexOf(templateRootName) !=3D -1) {
+ templateAllowed =3D true;
+ }
+ }
+ =
+ }
+ return ( templateAllowed );
+ } =
=
public String toString() {
final StringBuffer buff =3D new StringBuffer();
@@ -124,7 +176,9 @@
buff.append("\nname: ");
buff.append(name);
buff.append("\nurl: ");
- buff.append(url); =
+ buff.append(url);
+ buff.append("\nstylesDef: ");
+ buff.append(stylesDef); =
return buff.toString();
}
}
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htm=
leditors/JahiaHtmlEditorsDigester.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/htmleditors/JahiaHtmlEditorsDigest=
er.java&rev=3D18435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/JahiaHtmlEditorsDigester.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/JahiaHtmlEditorsDigester.java Thu Sep 13 15:58:47 2007
@@ -19,8 +19,8 @@
=
import java.io.File;
import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Vector;
import java.util.HashMap;
=
@@ -63,8 +63,10 @@
digester.addRule("editors/style-sheets/css/id",addCSSRule.setParam=
Rule);
digester.addRule("editors/style-sheets/css/name",addCSSRule.setPar=
amRule);
digester.addRule("editors/style-sheets/css/url",addCSSRule.setPara=
mRule);
+ digester.addRule("editors/style-sheets/css/stylesdef",addCSSRule.s=
etParamRule);
digester.addRule("editors/style-sheets/css/shared",addCSSRule.setP=
aramRule);
digester.addRule("editors/style-sheets/css/allowed-sites/site-key"=
, addCSSRule.addAllowedSiteRule);
+ digester.addRule("editors/style-sheets/css/allowed-templatesets/te=
mplate-root", addCSSRule.addAllowedTemplateSetRule);
}
=
/**
@@ -160,9 +162,11 @@
=
final class AddCSSRule extends Rule {
private HashMap params =3D new HashMap();
- private Set allowedSites =3D new HashSet();
+ private List allowedSites =3D new ArrayList();
+ private List allowedTemplateSets =3D new ArrayList();
SetParamRule setParamRule =3D new SetParamRule();
AddAllowedSiteRule addAllowedSiteRule =3D new AddAllowedSiteRule();
+ AddAllowedTemplateSetRule addAllowedTemplateSetRule =3D new AddAll=
owedTemplateSetRule();
=
public void end(String namespace, String name)
throws Exception {
@@ -170,13 +174,17 @@
new HtmlEditorCSS((String) params.get("id"),
(String) params.get("name"),
(String) params.get("url"),
+ (String) params.get("stylesdef"),
"true".equalsIgnoreCase((String) params.get("s=
hared")));
=
css.addAllowedSites(this.allowedSites);
- this.allowedSites =3D new HashSet();
+ css.addAllowedTemplateSets(this.allowedTemplateSets);
+ this.allowedSites =3D new ArrayList();
+ this.allowedTemplateSets =3D new ArrayList();
=
params.clear();
allowedSites.clear();
+ allowedTemplateSets.clear();
cssList.add( css );
}
=
@@ -193,6 +201,13 @@
allowedSites.add(text);
}
}
+ =
+ final class AddAllowedTemplateSetRule extends Rule {
+ public void body(String namespace, String name, String text)
+ throws Exception {
+ allowedTemplateSets.add(text);
+ }
+ } =
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htm=
leditors/JahiaHtmlEditorsFactory.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/htmleditors/JahiaHtmlEditorsFactor=
y.java&rev=3D18435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/JahiaHtmlEditorsFactory.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/htmledito=
rs/JahiaHtmlEditorsFactory.java Thu Sep 13 15:58:47 2007
@@ -18,6 +18,8 @@
package org.jahia.services.htmleditors;
=
import java.util.Hashtable;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Vector;
=
import org.jahia.exceptions.JahiaException;
@@ -30,8 +32,8 @@
*/
class JahiaHtmlEditorsFactory implements HtmlEditorsFactory
{
- private Hashtable htmlEditors;
- private Hashtable htmlEditorCSSs;
+ private Map htmlEditors;
+ private Map htmlEditorCSSs;
private JahiaHtmlEditorsDigester htmlEditorsDigester;
=
/**
@@ -45,8 +47,8 @@
*/
public JahiaHtmlEditorsFactory(String configFile) throws JahiaExceptio=
n{
this.configFile =3D configFile;
- this.htmlEditors =3D new Hashtable();
- this.htmlEditorCSSs =3D new Hashtable();
+ this.htmlEditors =3D new LinkedHashMap();
+ this.htmlEditorCSSs =3D new LinkedHashMap();
this.htmlEditorsDigester =3D new JahiaHtmlEditorsDigester();
=
if ( !loadEditors() ){
@@ -125,7 +127,7 @@
return false;
}
=
- this.htmlEditors =3D new Hashtable();
+ this.htmlEditors =3D new LinkedHashMap();
=
Vector v =3D this.htmlEditorsDigester.getHtmlEditors();
int size =3D v.size();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/htmledit=
ors/htmleditors_config.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/htmleditors/htmleditors_config.xml&rev=
=3D18435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/htmleditors/ht=
mleditors_config.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/htmleditors/ht=
mleditors_config.xml Thu Sep 13 15:58:47 2007
@@ -1,5 +1,4 @@
<editors>
-
<editor>
<id>FCKEditor</id>
<name>FCK Editor</name>
@@ -104,58 +103,62 @@
-->
=
<style-sheets>
- <!--
- <css>
- <id>green</id>
- <name>Green Style</name>
-
<url>http://localhost:7001/jahia/jsp/jahia/templates/myjahiasite/css/gr=
een.css</url>
+ <css>
+ <id>Corporate_portal_templates_v2</id>
+ <name>Corporate portal templates v2 styles</name>
+
<url>/jsp/jahia/templates/%SITE_NAME%/corporate_portal_templates_v2/css=
/template_css.jsp</url>
+
<stylesdef>/jsp/jahia/templates/%SITE_NAME%/corporate_portal_templates_=
v2/css/template_css.xml</stylesdef>
<shared>true</shared>
+ <allowed-templatesets>
+
<template-root>/corporate_portal_templates_v2/</template-root>
+ </allowed-templatesets> =
</css>
- -->
<css>
- <id>FCKEditor</id>
- <name>FCK Editor Styles</name>
-
<url>/jsp/jahia/htmleditors/fckeditor/editor/css/fck_editorarea.css</ur=
l>
+ <id>corpv2_blog</id>
+ <name>Corporate portal templates v2 BLOG styles</name>
+
<url>/jsp/jahia/templates/%SITE_NAME%/corporate_portal_templates_v2/css=
/template_css.jsp</url>
+
<stylesdef>/jsp/jahia/templates/%SITE_NAME%/corporate_portal_templates_=
v2/css/blog_css.xml</stylesdef>
<shared>true</shared>
- <!--
- <shared>false</shared>
- <allowed-sites>
- <site-key>myjahiasite</site-key>
- </allowed-sites>
- -->
- </css>
- <!--
+ <allowed-templatesets>
+
<template-root>/corporate_portal_templates_v2/</template-root>
+ </allowed-templatesets> =
+ </css> =
<css>
- <id>xinha</id>
- <name>Xinha Styles</name>
- <url>/jsp/jahia/htmleditors/xinha/htmlarea.css</url>
+ <id>Corporate_portal_templates</id>
+ <name>Corporate portal templates styles</name>
+
<url>/jsp/jahia/templates/%SITE_NAME%/corporate_portal_templates/web_cs=
s.jsp</url>
+
<stylesdef>/jsp/jahia/templates/%SITE_NAME%/corporate_portal_templates/=
web_css.xml</stylesdef>
<shared>true</shared>
-
- <shared>false</shared>
- <allowed-sites>
- <site-key>myjahiasite</site-key>
- </allowed-sites>
+ <allowed-templatesets>
+
<template-root>/corporate_portal_templates/</template-root>
+ </allowed-templatesets> =
</css>
- -->
- <!--
- <css>
- <id>ekit</id>
- <name>Ekit Demo Style</name>
- <url>/jsp/jahia/htmleditors/ekit/ekit.css</url>
+ <css>
+ <id>corpv2_blog</id>
+ <name>Corporate portal templates BLOG styles</name>
+
<url>/jsp/jahia/templates/%SITE_NAME%/corporate_portal_templates/web_cs=
s.jsp</url>
+
<stylesdef>/jsp/jahia/templates/%SITE_NAME%/corporate_portal_templates/=
blog_css.xml</stylesdef>
<shared>true</shared>
- </css>
- -->
+ <allowed-templatesets>
+
<template-root>/corporate_portal_templates/</template-root>
+ </allowed-templatesets> =
+ </css> =
<css>
- <id>jahia</id>
- <name>Jahia Engine Demo Styles</name>
- <url>/jsp/jahia/engines/css/jahia.css</url>
- <shared>true</shared>
- <!--
+ <id>Doc_templates</id>
+ <name>Doc templates styles</name>
+
<url>/jsp/jahia/templates/%SITE_NAME%/doc_templates/common/css/web.css<=
/url>
+
<stylesdef>/jsp/jahia/templates/%SITE_NAME%/doc_templates/common/css/we=
b_css.xml</stylesdef>
<shared>false</shared>
<allowed-sites>
- <site-key>myjahiasite</site-key>
- </allowed-sites>
- -->
+ <site-key>docSite</site-key>
+ </allowed-sites> =
+ </css> =
+ <css>
+ <id>FCKEditor</id>
+ <name>FCKEditor default styles</name>
+
<url>/jsp/jahia/htmleditors/fckeditor/editor/css/fck_editorarea.css</ur=
l>
+
<stylesdef>/jsp/jahia/htmleditors/fckeditor/fckstyles.xml</stylesdef>
+ <shared>true</shared>
</css>
</style-sheets>
</editors>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/cs=
s/jahia.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/css/jahia.css&rev=3D18435&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/jahi=
a.css (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/jahi=
a.css Thu Sep 13 15:58:47 2007
@@ -1,3 +1,5 @@
+body { background-color: #ffffff; padding: 5px 5px 5px 5px; margin:
0px; }
+body, td { font-family: Arial, Verdana, Sans-Serif;font-size: 12px; }
.text { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12p=
x; font-style: normal; color: #19313E; background-color: #ffffff}
.text A:link { color: #1E2A33 }
.text A:visited { color: #1E2A33 }
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/bigtext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp&rev=3D18=
435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp Thu Sep 13 15:58:47 2007
@@ -23,10 +23,7 @@
<%@ page import=3D"org.jahia.services.htmleditors.HtmlEditor" %>
<%@ page import=3D"org.jahia.services.htmleditors.HtmlEditorCSS" %>
<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
-<%@ page import=3D"java.util.Enumeration" %>
-<%@ page import=3D"java.util.HashMap" %>
-<%@ page import=3D"java.util.Hashtable" %>
-<%@ page import=3D"java.util.Iterator" %>
+<%@ page import=3D"java.util.*" %>
<%@ page import=3D"org.jahia.services.pages.JahiaPageDefinition"%>
<%@ page import=3D"org.jahia.services.pages.ContentPage"%>
<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
@@ -36,6 +33,7 @@
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %>
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-html" prefix=3D"html" %>
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
+<[EMAIL PROTECTED]
import=3D"org.jahia.data.fields.JahiaFieldDefinitionProperties"%>
<jahia:i18n/>
=
<%
@@ -55,13 +53,77 @@
}
final HtmlEditorsViewHelper heViewHelper =3D (HtmlEditorsViewHelper) e=
ngineMap.get(BigText_Field.HTMLEDITOR_VIEW_HELPER_ATTRIBUTE);
HtmlEditor defaultEditor =3D heViewHelper.getDefaultEditor(true);
+ final List editors =3D new ArrayList();
+ =
+ final boolean isSafariOrOpera =3D request.getHeader("User-Agent") !=3D=
null
+ && (request.getHeader("User-Agent").indexOf("Safari") !=3D -1 || r=
equest
+ .getHeader("User-Agent").indexOf("Opera") !=3D -1);
+
+ final Enumeration editorsEnum =3D heViewHelper.getEditors();
+ while (editorsEnum.hasMoreElements()) {
+ final HtmlEditor editor =3D (HtmlEditor) editorsEnum
+ .nextElement();
=
- final Hashtable cssList;
+ if (null =3D=3D defaultEditor) {
+ defaultEditor =3D editor;
+ }
+
+// do not show FCKeditor on Safari and Opera
+ if (isSafariOrOpera && "FCKEditor".equals(editor.getId())) {
+ if ("FCKEditor".equals(defaultEditor.getId())) {
+ defaultEditor =3D null;
+ }
+ continue;
+ }
+ editors.add(editor);
+ }
+ =
+ final Map cssList;
if (defaultEditor !=3D null && defaultEditor.enableCSS()) {
cssList =3D heViewHelper.getEnabledCSSs();
} else {
cssList =3D new Hashtable();
}
+ if (cssList.size() > 0) {
+ String cssId =3D theField.getDefinition().getProperty(JahiaFieldDe=
finitionProperties.FIELD_STYLESHEET_ID_PROP);
+ HtmlEditorCSS htmlEditorCSS =3D null; =
+ if (cssId !=3D null && cssId.length() > 0) {
+ htmlEditorCSS =3D (HtmlEditorCSS)cssList.get(cssId); =
+ }
+ if (htmlEditorCSS =3D=3D null) {
+ htmlEditorCSS =3D (HtmlEditorCSS)cssList.get(heViewHelper.getD=
efaultCSSID());
+ } =
+
+ if (htmlEditorCSS =3D=3D null) {
+ final int pageID =3D (theField.getPageID() > 0) ? theField.get=
PageID() : jParams.getPageID();
+ final ContentPage thePage =3D ServicesRegistry.getInstance().g=
etJahiaPageService().lookupContentPage(pageID, true);
+ final JahiaPageDefinition pageTemplate =3D thePage.getPageTemp=
late(jParams);
+ final String templateSourcePath =3D pageTemplate !=3D null ? p=
ageTemplate.getSourcePath() : ""; =
+ =
+ Iterator cssListEnum =3D cssList.values().iterator();
+ while (cssListEnum.hasNext() && htmlEditorCSS =3D=3D null) {
+ HtmlEditorCSS editorCSS =3D (HtmlEditorCSS) cssListEnum.ne=
xt();
+ if (editorCSS.isSiteAllowed(jParams.getSiteKey()) && edito=
rCSS.isTemplateAllowed(templateSourcePath)){
+ htmlEditorCSS =3D editorCSS; =
+ }
+ } =
+ } =
+ if (htmlEditorCSS !=3D null) {
+ String htmlEditorCSSUrl =3D htmlEditorCSS.getURL();
+ String htmlEditorCSSDef =3D htmlEditorCSS.getStylesDef();
+ final int siteWildcardIndex =3D htmlEditorCSSUrl.indexOf("%SIT=
E_NAME%");
+ if (siteWildcardIndex !=3D -1) {
+ htmlEditorCSSUrl =3D htmlEditorCSSUrl.replace("%SITE_NAME%=
", =
+ jParams.getSiteKey());
+ htmlEditorCSSDef =3D htmlEditorCSSDef.replace("%SITE_NAME%=
", =
+ jParams.getSiteKey());
+ }
+ engineMap.put("htmlEditorCSS", htmlEditorCSS);
+ engineMap.put("htmlEditorCSSUrl", htmlEditorCSSUrl); =
=
+ engineMap.put("htmlEditorCSSDef", htmlEditorCSSDef);
+ } =
+ } =
+ =
=
String theOldField =3D theField.getValue();
String theNewField;
@@ -160,85 +222,6 @@
<% } %>
<% } %>
=
-<p>
- <select name=3D"htmlEditor" onchange=3D"changeHtmlEditor('<%=3DtheScre=
en%>');">
- <%
- boolean isSafariOrOpera =3D request.getHeader("User-Agent")
!=3D =
null && (request.getHeader("User-Agent").indexOf("Safari") !=3D -1 || reque=
st.getHeader("User-Agent").indexOf("Opera") !=3D -1);
- =
- final Enumeration editors =3D heViewHelper.getEditors();
- while (editors.hasMoreElements()) {
- final HtmlEditor editor =3D (HtmlEditor) editors.nextEleme=
nt();
- =
- if (null =3D=3D defaultEditor) {
- defaultEditor =3D editor;
- }
- =
- // do not show FCKeditor on Safari and Opera
- if (isSafariOrOpera && "FCKEditor".equals(editor.getId()))=
{
- if ("FCKEditor".equals(defaultEditor.getId())) {
- defaultEditor =3D null;
- }
- continue;
- }
- %>
- <option value=3D"<%=3Deditor.getId()%>"
- <% if (defaultEditor !=3D null && editor.getId().equals(de=
faultEditor.getId())) {
- %> selected=3D"selected"<%
- }%>>
- <%=3Deditor.getDisplayName()%>
- </option>
- <% } %>
- </select> &=
nbsp;
- <% if (cssList.size() > 0) {
- boolean selectedCSS =3D (cssList.get(heViewHelper.getDefaultCSSID(=
)) !=3D null);
- if (selectedCSS) {
- engineMap.put("htmlEditorCSS", cssList.get(heViewHelper.getDef=
aultCSSID()));
- }
-
- String defaultCSS =3D heViewHelper.getDefaultCSSID();
-
- %><span><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
shared.BigText_Field.availableCSS.label"/>:</span>
- <select name=3D"htmlEditorCSS" onchange=3D"changeCSS('<%=3DtheScreen%>=
');">
- <%
-
- final int pageID =3D (theField.getPageID() > 0) ? theField.get=
PageID() : jParams.getPageID();
- final ContentPage thePage =3D ServicesRegistry.getInstance().g=
etJahiaPageService().lookupContentPage(pageID, true);
- final JahiaPageDefinition pageTemplate =3D thePage.getPageTemp=
late(jParams);
-
- if (pageTemplate !=3D null) {
- final StringBuffer buff =3D new StringBuffer();
- final String sourcePath =3D pageTemplate.getSourcePath();
-
- if (sourcePath.indexOf("corporate_portal_templates_v2") > -1) {
- // todo show v2 CSS as well
- } else if (sourcePath.indexOf("corporate_portal_templates") > =
-1) {
- buff.append(request.getContextPath()).append(sourcePath.su=
bstring(0, sourcePath.lastIndexOf("/")));
- buff.append("/web_css.jsp");
-
- final HtmlEditorCSS templateCSS =3D new HtmlEditorCSS("tem=
plateCSS", "Corporate Template Styles", buff.toString(), true);
- cssList.put("templateCSS", templateCSS);
- }
- }
-
- final Iterator iterator =3D cssList.values().iterator();
- while (iterator.hasNext()) {
- final HtmlEditorCSS css =3D (HtmlEditorCSS) iterator.next(=
);
- if (!selectedCSS) {
- defaultCSS =3D css.getId();
- selectedCSS =3D true;
- engineMap.put("htmlEditorCSS", css);
- }
- %>
- <option value=3D"<%=3Dcss.getId()%>"
- <% if (css.getId().equals(defaultCSS)) { %> selected=3D"se=
lected" <% } %>>
- <%=3Dcss.getName()%>
- </option>
- <%}%>
- </select>
-</p>
-<%}%>
-
-
<% if (defaultEditor =3D=3D null) {
final String simpleTextEditor =3D jParams.settings().getHtmlEditorsCon=
text() +
"/simpletext/simpletext_htmleditor.jsp";
@@ -252,3 +235,20 @@
=
<jsp:include page=3D"<%=3Dbuff.toString()%>" flush=3D"true"/>
<% } %>
+
+<p>
+ <select name=3D"htmlEditor" onchange=3D"changeHtmlEditor('<%=3DtheScre=
en%>');">
+ <%
+ for (Iterator it =3D editors.iterator(); it.hasNext();) {
+ final HtmlEditor editor =3D (HtmlEditor) it.next();
+ %> =
+ <option value=3D"<%=3Deditor.getId()%>"
+ <% if (defaultEditor !=3D null && editor.getId().equals(de=
faultEditor.getId())) {
+ %> selected=3D"selected"<%
+ }%>>
+ <%=3Deditor.getDisplayName()%>
+ </option>
+ <% } %>
+ </select>
+</p>
+
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditor=
s/ekit/ekit_htmleditor.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/htmleditors/ekit/ekit_htmleditor.jsp&rev=
=3D18435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/ekit=
/ekit_htmleditor.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/ekit=
/ekit_htmleditor.jsp Thu Sep 13 15:58:47 2007
@@ -60,22 +60,14 @@
}
=
=
- HtmlEditorCSS htmlEditorCSS =3D
(HtmlEditorCSS)engineMap.get( "htmlEd=
itorCSS" );
- String cssURL =3D "";
- if ( htmlEditorCSS !=3D null ){
- cssURL =3D htmlEditorCSS.getURL();
- if ( cssURL =3D=3D null ){
- cssURL =3D "";
- }
- }
+ String cssURL =3D (String)engineMap.get( "htmlEditorCSSUrl" );
+ if ( cssURL =3D=3D null ){
+ cssURL =3D "";
+ }
=
- if ( !("".equals(cssURL)) ){
- if ( cssURL.startsWith("/") ){
- cssURL =3D request.getContextPath() + cssURL;
- }
+ if ( cssURL.length() > 0 && cssURL.startsWith("/") ){
+ cssURL =3D request.getContextPath() + cssURL;
}
-
-
%>
=
<% =
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditor=
s/eopro3/mac.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopro3/mac.jsp&rev=3D18435&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o3/mac.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o3/mac.jsp Thu Sep 13 15:58:47 2007
@@ -32,19 +32,13 @@
ParamBean jParams =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
String theURL =3D (String) jParams.settings().getJah=
iaEnginesHttpPath();
Boolean isSelectedField =3D (Boolean) engineMap.get(
"isSelectedFiel=
d" );
- HtmlEditorCSS htmlEditorCSS =3D
(HtmlEditorCSS)engineMap.get( "htmlEd=
itorCSS" );
- String cssURL =3D "";
- if ( htmlEditorCSS !=3D null ){
- cssURL =3D htmlEditorCSS.getURL();
- if ( cssURL =3D=3D null ){
- cssURL =3D "";
- }
- }
- =
- if ( !("".equals(cssURL)) ){
- if ( cssURL.startsWith("/") ){
- cssURL =3D request.getContextPath() + cssURL;
- }
+ String cssURL =3D (String)engineMap.get( "htmlEditorCSSUrl" );
+ if ( cssURL =3D=3D null ){
+ cssURL =3D "";
+ }
+
+ if ( cssURL.length() > 0 && cssURL.startsWith("/") ){
+ cssURL =3D request.getContextPath() + cssURL;
}
=
%>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditor=
s/eopro3/no_mac.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopro3/no_mac.jsp&rev=3D18435=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o3/no_mac.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o3/no_mac.jsp Thu Sep 13 15:58:47 2007
@@ -32,19 +32,13 @@
ParamBean jParams =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
String theURL =3D (String) jParams.settings().getJah=
iaEnginesHttpPath();
Boolean isSelectedField =3D (Boolean) engineMap.get(
"isSelectedFiel=
d" );
- HtmlEditorCSS htmlEditorCSS =3D
(HtmlEditorCSS)engineMap.get( "htmlEd=
itorCSS" );
- String cssURL =3D "";
- if ( htmlEditorCSS !=3D null ){
- cssURL =3D htmlEditorCSS.getURL();
- if ( cssURL =3D=3D null ){
- cssURL =3D "";
- }
- }
+ String cssURL =3D (String)engineMap.get( "htmlEditorCSSUrl" );
+ if ( cssURL =3D=3D null ){
+ cssURL =3D "";
+ }
=
- if ( !("".equals(cssURL)) ){
- if ( cssURL.startsWith("/") ){
- cssURL =3D request.getContextPath() + cssURL;
- }
+ if ( cssURL.length() > 0 && cssURL.startsWith("/") ){
+ cssURL =3D request.getContextPath() + cssURL;
}
=
%>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditor=
s/eopro4/main.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopro4/main.jsp&rev=3D18435&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o4/main.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/eopr=
o4/main.jsp Thu Sep 13 15:58:47 2007
@@ -34,19 +34,13 @@
ParamBean jParams =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
String theURL =3D (String) jParams.settings().getJah=
iaEnginesHttpPath();
Boolean isSelectedField =3D (Boolean) engineMap.get(
"isSelectedFiel=
d" );
- HtmlEditorCSS htmlEditorCSS =3D
(HtmlEditorCSS)engineMap.get( "htmlEd=
itorCSS" );
- String cssURL =3D "";
- if ( htmlEditorCSS !=3D null ){
- cssURL =3D htmlEditorCSS.getURL();
- if ( cssURL =3D=3D null ){
- cssURL =3D "";
- }
- }
+ String cssURL =3D (String)engineMap.get( "htmlEditorCSSUrl" );
+ if ( cssURL =3D=3D null ){
+ cssURL =3D "";
+ }
=
- if ( !("".equals(cssURL)) ){
- if ( cssURL.startsWith("/") ){
- cssURL =3D request.getContextPath() + cssURL;
- }
+ if (cssURL.length() > 0 && cssURL.startsWith("/") ){
+ cssURL =3D request.getContextPath() + cssURL;
}
=
String eoproJs =3D request.getContextPath() + jParams.settings().getHtm=
lEditorsContext() + "eopro4/editonpro.js";
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditor=
s/fckeditor/fckeditor_htmleditor.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmledito=
r.jsp&rev=3D18435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke=
ditor/fckeditor_htmleditor.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke=
ditor/fckeditor_htmleditor.jsp Thu Sep 13 15:58:47 2007
@@ -81,7 +81,8 @@
jahiaPath.append(request.getServletPath());
}
=
- final String htmlEditorCSSUrl =3D ((HtmlEditorCSS)engineMap.get("htmlE=
ditorCSS")).getURL();
+ final String htmlEditorCSSUrl =3D (String)engineMap.get("htmlEditorCSS=
Url");
+ final String htmlEditorCSSDef =3D (String)engineMap.get("htmlEditorCSS=
Def");
=
StringBuffer buff =3D new StringBuffer();
EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
@@ -151,14 +152,21 @@
oFCKeditor =3D new FCKeditor('jahiaEditor', '100%', '400');
oFCKeditor.BasePath =3D sBasePath;
oFCKeditor.Config.basePath =3D "<%=3DfckUrl%>";
-
- oFCKeditor.Config.StylesXmlPath =3D '<%=3DfckUrl%>fckstyles.xml';
- //oFCKeditor.Config.EditorAreaCSS =3D '<%=3DfckUrl%>editor/css/fck=
_editorarea.css';
- <% if (htmlEditorCSSUrl.startsWith(request.getContextPath())) { %>
+ =
+ <%if (htmlEditorCSSUrl.length() =3D=3D 0) {%>
+ oFCKeditor.Config.EditorAreaCSS =3D '<%=3DfckUrl%>editor/css/fck_e=
ditorarea.css'; =
+ <% } else if (htmlEditorCSSUrl.startsWith(request.getContextPath())) {=
%>
oFCKeditor.Config.EditorAreaCSS =3D '<%=3DhtmlEditorCSSUrl%>';
<% } else { %>
oFCKeditor.Config.EditorAreaCSS =3D '<jahia:serverHttpPath/><%=3Dh=
tmlEditorCSSUrl%>';
- <% } %>
+ <% } =
+ if (htmlEditorCSSDef.length() =3D=3D 0) {%>
+ oFCKeditor.Config.StylesXmlPath =3D '<%=3DfckUrl%>fckstyles.xml';
+ <%} else if (htmlEditorCSSDef.startsWith(request.getContextPath())) {%>
+ oFCKeditor.Config.StylesXmlPath =3D '<%=3DhtmlEditorCSSDef%>';
+ <%} else {%>
+ oFCKeditor.Config.StylesXmlPath =3D '<jahia:serverHttpPath/><%=3Dh=
tmlEditorCSSDef%>';
+ <%}%>
=
//Set image dialog configuration
//oFCKeditor.Config.ImageBrowserURL =3D sBasePath + "editor/plugin=
s/JahiaImager/dialog.jsp";
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
