Merge pull request #1420 from OpenTechFund/feature/allow-more-table-tags

Allow more table tags and add table button to editor.

opentech/apply/utils/options.py

@@ -5,7 +5,7 @@ MCE_ATTRIBUTES = {
     'branding': False,
     'entity_encoding': 'raw',
     'plugins': 'link image preview codesample table code lists',
-    'toolbar1': 'undo redo | styleselect | bold italic | bullist numlist | link',
+    'toolbar1': 'undo redo | styleselect | bold italic | bullist numlist | table | link',
     'style_formats': [
         {'title': 'Headers', 'items': [
             {'title': 'Header 1', 'format': 'h1'},

opentech/settings/base.py

@@ -463,9 +463,9 @@ SOCIAL_AUTH_PIPELINE = (
 )
 
 # Bleach Settings
-BLEACH_ALLOWED_TAGS = ['a', 'b', 'big', 'blockquote', 'br', 'cite', 'code', 'dd', 'del', 'dl', 'dt', 'em', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'ins', 'li', 'ol', 'p', 'pre', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'th', 'thead', 'tr', 'ul']
+BLEACH_ALLOWED_TAGS = ['a', 'b', 'big', 'blockquote', 'br', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dl', 'dt', 'em', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'ins', 'li', 'ol', 'p', 'pre', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'th', 'thead', 'tr', 'ul']
 
-BLEACH_ALLOWED_ATTRIBUTES = ['href', 'title', 'class']
+BLEACH_ALLOWED_ATTRIBUTES = ['class', 'colspan', 'href', 'rowspan', 'title', 'width']
 
 BLEACH_ALLOWED_STYLES = []