improved and allowed more tiny/html options

lvanderree · Oct 19, 2011 · 425d71a · 425d71a
1 parent 47cf9ac
commit 425d71a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/mercury/static/mercury/stylesheets/structured.css b/mercury/static/mercury/stylesheets/structured.css
@@ -55,6 +55,7 @@ pre, code {
     white-space: -moz-pre-wrap;   /* Mozilla, since 1999 */
     white-space: -o-pre-wrap;     /* Opera 7 */
     word-wrap: break-word;        /* Internet Explorer 5.5+ */
+    display: block
 }
 
 dd.lot-eigenaar a {

diff --git a/mercury/utils.py b/mercury/utils.py
@@ -13,6 +13,8 @@
     'abbr', 'acronym', 'blockquote',
     'br',
     'img',
+
+    'table', 'thead', 'tbody', 'tfoot', 'tr', 'th', 'td',
 ]
 
 ALLOWED_ATTRIBUTES = {
@@ -40,6 +42,14 @@
     'acronym': ['title'],
 
     'img': ['class', 'src', 'alt', 'title', 'width', 'height'],
+
+    'table': ['class', 'style', 'border', 'cellspacing', 'cellpadding'],
+    'thead': ['class'],
+    'tbody': ['class'],
+    'tfoot': ['class'],
+    'tr':    ['class'],
+    'th':    ['class', 'scope', 'colspan'],
+    'td':    ['class', 'scope', 'colspan'],
 }
 
 def sanitize(text, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTRIBUTES):
@@ -51,4 +61,4 @@ def sanitize(text, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTRIBUTES):
 
 def tidy(text):
     "sanitize wrapper in tidy interface"
-    return (sanitize(text), None, None) # TODO: return errors and warnings
+    return (sanitize(text), None, None) # TODO: return errors and warnings