Ubuntu Developer Portal

Merge lp:~davidc3/developer-ubuntu-com/iframes-ckeditor into lp:developer-ubuntu-com

  1. iframes-ckeditor
  2. Merge into stable
Proposed by David Callé on 2015-12-04
Status: Merged
Approved by: David Callé on 2015-12-04
Approved revision: 180
Merged at revision: 180
Proposed branch: lp:~davidc3/developer-ubuntu-com/iframes-ckeditor
Merge into: lp:developer-ubuntu-com
Diff against target: 15 lines (+5/-0)
1 file modified
developer_portal/settings.py (+5/-0)
To merge this branch: bzr merge lp:~davidc3/developer-ubuntu-com/iframes-ckeditor
Reviewer Review Type Date Requested Status
Daniel Holbach (community) 2015-12-04 Approve on 2015-12-04
Review via email: mp+279625@code.launchpad.net

Commit Message

Allow iframes in ckeditor for Youtube playlists and such

Description of the Change

Allow iframes in ckeditor for Youtube playlists and such.

To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'developer_portal/settings.py'
2--- developer_portal/settings.py 2015-12-04 11:49:10 +0000
3+++ developer_portal/settings.py 2015-12-04 16:11:16 +0000
4@@ -290,6 +290,11 @@
5 'toolbar': 'Zinnia',
6 },
7 }
8+
9+# Allow iframes in ckeditor
10+TEXT_ADDITIONAL_TAGS = ('iframe',)
11+TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
12+
13 CMSPLUGIN_ZINNIA_APP_URLS = ['developer_portal.blog.urls']
14
15 REST_FRAMEWORK = {

Subscribers

People subscribed via source and target branches