Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

multiple TinyMCE styles from theme bundle #1598

Merged
merged 1 commit into from
May 31, 2016
Merged

multiple TinyMCE styles from theme bundle #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ New:

- Add link to training.plone.org
[svx]
- Allow to define multiple ``tinymce-content-css`` in theme ``manifest.cfg`` files, seperated by a comma.
[thet]

- Update npm package depencies.
[thet]
Expand Down
5 changes: 4 additions & 1 deletion Products/CMFPlone/patterns/tinymce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down