ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1018 from emanuelschuetze/fix957

Browse Source 
Extend css style optinos in CKEditor
This commit is contained in:
Norman Jäckel 2013-11-10 10:48:42 -08:00
commit 8239b80668
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/motion/pdf.py
View File

@ -189,6 +189,8 @@ def convert_html_to_reportlab(pdf, text):
tag.unwrap() tag.unwrap()
for tag in soup.find_all('li'): for tag in soup.find_all('li'):
tag.unwrap() tag.unwrap()
for tag in soup.find_all('span'):
tag.unwrap()
# print paragraphs with numbers # print paragraphs with numbers
text = soup.body.contents text = soup.body.contents
paragraph_number = 1 paragraph_number = 1

11
openslides/static/javascript/ckeditor-config.js
View File

@ -11,7 +11,7 @@ var ck_options = {
bodyClass: "ckeditor_html", bodyClass: "ckeditor_html",
allowedContent: allowedContent:
'h1 h2 h3 pre blockquote b i u strike;' + 'h1 h2 h3 pre b i u strike em;' +
// A workaround for the problem described in http://dev.ckeditor.com/ticket/10192 // A workaround for the problem described in http://dev.ckeditor.com/ticket/10192
// Hopefully, the problem will be solved in the final version of CKEditor 4.1 // Hopefully, the problem will be solved in the final version of CKEditor 4.1
@ -19,10 +19,9 @@ var ck_options = {
'p{margin-left};' + 'p{margin-left};' +
'a[!href];' + 'a[!href];' +
'table tr th td caption;' + 'ol ul{list-style};' +
'ol ul li;' + 'li;' +
'span{!font-family};' + 'span{color,background-color};',
'span{!color};',
removePlugins: "save, print, preview, pagebreak, templates, showblocks, magicline", removePlugins: "save, print, preview, pagebreak, templates, showblocks, magicline",
// Not part of the standard package of CKEditor // Not part of the standard package of CKEditor
@ -37,7 +36,7 @@ var ck_options = {
{ name: 'basicstyles', items : [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ] }, { name: 'basicstyles', items : [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ] },
{ name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Pre','InsertPre','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ] }, { name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Pre','InsertPre','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ] },
{ name: 'links', items : [ 'Link','Unlink','Anchor' ] }, { name: 'links', items : [ 'Link','Unlink','Anchor' ] },
{ name: 'styles', items : [ 'Format','FontSize' ] }, { name: 'styles', items : [ 'Format','FontSize','TextColor','BGColor' ] },
{ name: 'tools', items : [ 'Maximize', 'ShowBlocks','-','About' ] } { name: 'tools', items : [ 'Maximize', 'ShowBlocks','-','About' ] }
], ],
toolbar: 'Full' toolbar: 'Full'

3
openslides/utils/forms.py
View File

@ -27,9 +27,10 @@ HTML_TAG_WHITELIST = ('a',
HTML_ATTRIBUTES_WHITELIST = { HTML_ATTRIBUTES_WHITELIST = {
'a': ['href'], 'a': ['href'],
'*': ['style'],
} }
HTML_STYLES_WHITELIST = () HTML_STYLES_WHITELIST = ('color', 'background-color', 'list-style')
class CssClassMixin(object): class CssClassMixin(object):

7
tests/forms/test_clean_html.py
View File

@ -40,14 +40,13 @@ class CleanHtmlTest(TestCase):
self.clean_html('<p href="evil.com">good?</p>', '<p>good?</p>') self.clean_html('<p href="evil.com">good?</p>', '<p>good?</p>')
self.clean_html('<p onclick="javascript:evil();">Not evil</p>', '<p>Not evil</p>') self.clean_html('<p onclick="javascript:evil();">Not evil</p>', '<p>Not evil</p>')
self.clean_html('<div style="margin-top: 100000em;">evil</div>', 'evil') self.clean_html('<div style="margin-top: 100000em;">evil</div>', 'evil')
self.clean_html('<p style="font-weight:bold;">bad</p>', '<p>bad</p>')
self.clean_html('<table><tbody><tr><td>OK</td></tr></tbody></table>', 'OK') self.clean_html('<table><tbody><tr><td>OK</td></tr></tbody></table>', 'OK')
self.clean_html('<blockquote>OK</blockquote>', 'OK') self.clean_html('<p style="text-decoration: underline;">OK</p>', '<p style="">OK</p>')
self.clean_html('<p style="text-decoration: underline;">OK</p>', '<p>OK</p>')
# Allowed tags and attributes # Allowed tags and attributes
self.clean_html('<a href="evil.com">good?</a>') self.clean_html('<a href="evil.com">good?</a>')
self.clean_html('<p>OK</p>') self.clean_html('<p>OK</p>')
self.clean_html('<p><strong>OK</strong></p>') self.clean_html('<p><strong>OK</strong></p>')
self.clean_html('<pre>OK</pre>') self.clean_html('<pre>OK</pre>')
self.clean_html('<ul><li>OK</li></ul>') self.clean_html('<ul style="list-style: circle inside;"><li>OK</li></ul>')
self.clean_html('<span style="color: red;">OK</span>')