Skip to content
Snippets Groups Projects
Commit 23d4c580 authored by srosse's avatar srosse
Browse files

no-jira: make the url to content.css for tinymce without server domain

parent 88b3481e
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment