From afae8d6744a3f8a3219f2df46f21721e0972dce3 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Fri, 20 May 2016 02:08:09 +0200 Subject: [PATCH] Allow to define multiple ``tinymce-content-css`` in theme ``manifest.cfg`` files, seperated by a comma. Like above. --- CHANGES.rst | 3 +++ Products/CMFPlone/patterns/tinymce.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 741acba113..d348be03fe 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -18,6 +18,9 @@ Incompatibilities: New: +- Allow to define multiple ``tinymce-content-css`` in theme ``manifest.cfg`` files, seperated by a comma. + [thet] + - Supported ``remove`` keyword for configlets in controlpanel.xml. [maurits] - Deprecated Gruntfile generation script ``plone-generate-gruntfile``. diff --git a/Products/CMFPlone/patterns/tinymce.py b/Products/CMFPlone/patterns/tinymce.py index 64e0d9084a..1a05ed31dc 100644 --- a/Products/CMFPlone/patterns/tinymce.py +++ b/Products/CMFPlone/patterns/tinymce.py @@ -42,7 +42,10 @@ def get_content_css(self, style_css=''): theme = self.get_theme() tinymce_content_css = getattr(theme, 'tinymce_content_css', None) if tinymce_content_css is not None: - files.append(self.nav_root_url + theme.tinymce_content_css) + files.extend([ + self.nav_root_url + _ + for _ in theme.tinymce_content_css.split(',') + ]) return ','.join(files)