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

fix: restore auto-paragraph #412

Merged
merged 4 commits into from
Jan 30, 2024
Merged

fix: restore auto-paragraph #412

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc3e33b
fix: restore auto-paragraph
wesleyboar Jan 18, 2024
6570b2f
Merge branch 'main' into fix/restore-auto-paragraph
wesleyboar Jan 19, 2024
ec17a87
Merge branch 'main' into fix/restore-auto-paragraph
wesleyboar Jan 22, 2024
77192cc
Merge branch 'main' into fix/restore-auto-paragraph
wesleyboar Jan 30, 2024
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
6 changes: 6 additions & 0 deletions apps/tup-cms/src/taccsite_cms/settings_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@
# https://github.com/django-cms/django-filer/blob/2.0.2/docs/permissions.rst
FILER_ENABLE_PERMISSIONS = True

# https://github.com/django-cms/djangocms-text-ckeditor
CKEDITOR_SETTINGS = {
'autoParagraph': True, # Core-CMS had set this to False
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Important. This is what is changing. Paragraphs will automatically wrap inline elements upon editing a Text plugin instance.

'stylesSet': 'default:/static/js/addons/ckeditor.wysiwyg.js',
'contentsCss': ['/static/djangocms_text_ckeditor/ckeditor/contents.css'],
}
Comment on lines +211 to +213
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explanation. I must duplicate these two settings from Core-CMS, because settings are not smart enough to merge lists.


# DJANGOCMS_ICON SETTINGS
# https://github.com/django-cms/djangocms-icon
Expand Down
Loading