UbuCon site

Merge lp:~dpm/ubucon-site/iframes-ckeditor into lp:ubucon-site

  1. iframes-ckeditor
  2. Merge into production
Proposed by David Planella on 2015-12-10
Status: Merged
Merged at revision: 36
Proposed branch: lp:~dpm/ubucon-site/iframes-ckeditor
Merge into: lp:ubucon-site
Diff against target: 11 lines (+4/-0)
1 file modified
ubucon_site/settings/__init__.py (+4/-0)
To merge this branch: bzr merge lp:~dpm/ubucon-site/iframes-ckeditor
Reviewer Review Type Date Requested Status
David Callé 2015-12-10 Approve on 2015-12-10
Review via email: mp+280172@code.launchpad.net

Description of the Change

Enable support for iframes in the text editors

To post a comment you must log in.
David Callé (davidc3) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubucon_site/settings/__init__.py'
2--- ubucon_site/settings/__init__.py 2015-11-16 18:22:00 +0000
3+++ ubucon_site/settings/__init__.py 2015-12-10 17:08:32 +0000
4@@ -250,3 +250,7 @@
5 # Django 1.6 uses a JSON serializer by default, which breaks
6 # django_openid_auth, so force it to use the old default
7 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
8+
9+# Allow iframes in ckeditor
10+TEXT_ADDITIONAL_TAGS = ('iframe',)
11+TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')

Subscribers

People subscribed via source and target branches