From 23d4c580ea0956556e2d8b3dc11fcde3f13faceb Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Tue, 27 Jan 2015 17:36:35 +0100 Subject: [PATCH] no-jira: make the url to content.css for tinymce without server domain --- .../impl/elements/richText/RichTextConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java index 2470e4e4af0..18233c41a5c 100644 --- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java +++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java @@ -469,7 +469,7 @@ public class RichTextConfiguration implements Disposable { public void setContentCSSFromTheme(Theme theme) { // Always use default content css, then add the one from the theme if (theme.getIdentifyer().equals(Theme.DEFAULTTHEME)) { - setContentCSS(theme.getBaseURI() + "content.css"); + setContentCSS(theme.getBaseURI() + "content.css"); } else { StringOutput cssFiles = new StringOutput(); StaticMediaDispatcher.renderStaticURI(cssFiles, "themes/" + Theme.DEFAULTTHEME + "/content.css"); @@ -721,7 +721,7 @@ public class RichTextConfiguration implements Disposable { if(contentCss != null) { // add styles from content css and add them to format menu copyNonValues.put(IMPORTCSS_APPEND, "true"); - copyValues.put("content_css", Settings.createServerURI() + contentCss); + copyValues.put("content_css", contentCss); // filter emoticons classes from content css copyNonValues.put(IMPORT_SELECTOR_CONVERTER, IMPORT_SELECTOR_CONVERTER_VALUE_REMOVE_EMOTICONS); // group imported css classes to paragraph, div, table and style menu -- GitLab