From 998f4576fe7373e89db8c07d87c10a0332d75364 Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Tue, 31 May 2011 15:39:46 +0200 Subject: [PATCH 1/3] Fix div collision --- www/media/idf/css/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css index 4998e70..2ae7176 100644 --- a/www/media/idf/css/style.css +++ b/www/media/idf/css/style.css @@ -127,9 +127,9 @@ ul.errorlist { div.user-messages { border: 1px solid rgb(229, 225, 169); background-color: #fffde3; - margin-bottom: 1em; + margin-bottom: 2em; margin-left: -1px; - width: 90%; + width: 100%; } div.theterms { @@ -275,7 +275,7 @@ div.issue-changes-timeline { div.issue-prev-next { float: right; - margin-top: -25px; + margin-top: -1.5em; } div.issue-submit-info { From d350876bc1ab8c1962737c2f3c7c9db1b9bc6d3b Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Wed, 1 Jun 2011 10:10:01 +0200 Subject: [PATCH 2/3] Update allowed attributes in the Markdown Prefilter, to be less strict. Fix issue 578 --- src/IDF/Template/MarkdownPrefilter.php | 97 +++++++++++++++++--------- 1 file changed, 63 insertions(+), 34 deletions(-) diff --git a/src/IDF/Template/MarkdownPrefilter.php b/src/IDF/Template/MarkdownPrefilter.php index f1f3967..11c2643 100644 --- a/src/IDF/Template/MarkdownPrefilter.php +++ b/src/IDF/Template/MarkdownPrefilter.php @@ -90,40 +90,69 @@ class IDF_Template_MarkdownPrefilter extends Pluf_Text_HTML_Filter ); public $allowed = array( - 'a' => array('href', 'title', 'rel'), - 'abbr' => array('title'), - 'address' => array(), - 'b' => array(), - 'blockquote' => array(), - 'br' => array(), - 'caption' => array(), - 'code' => array(), - 'dd' => array(), - 'del' => array('cite', 'class', 'datetime', 'dir', 'id', 'title'), - 'div' => array('align', 'class'), - 'dl' => array(), - 'dt' => array(), - 'em' => array(), - 'h1' => array('id'), - 'h2' => array('id'), - 'h3' => array('id'), - 'h4' => array('id'), - 'h5' => array('id'), - 'h6' => array('id'), - 'hr' => array(), - 'i' => array(), - 'img' => array('src', 'class', 'alt', 'height', 'width', 'style'), - 'ins' => array('cite', 'class', 'datetime', 'dir', 'id', 'title'), - 'li' => array(), - 'ol' => array(), - 'p' => array('align', 'class'), - 'pre' => array(), - 'strong' => array(), - 'table' => array('summary'), - 'td' => array('style'), - 'th' => array(), - 'tr' => array(), - 'ul' => array(), + 'a' => array('class', 'dir', 'id', 'style', 'title', + 'href', 'hreflang', 'rel'), + 'abbr' => array('class', 'dir', 'id', 'style', 'title'), + 'address' => array('class', 'dir', 'id', 'style', 'title'), + 'b' => array('class', 'dir', 'id', 'style', 'title'), + 'blockquote' => array('class', 'dir', 'id', 'style', 'title', + 'cite'), + 'br' => array('class', 'id', 'style', 'title'), + 'caption' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute), + 'code' => array('class', 'dir', 'id', 'style', 'title'), + 'dd' => array('class', 'dir', 'id', 'style', 'title'), + 'del' => array('class', 'dir', 'id', 'style', 'title', + 'cite', 'datetime'), + 'div' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute + 'dl' => array('class', 'dir', 'id', 'style', 'title'), + 'dt' => array('class', 'dir', 'id', 'style', 'title'), + 'em' => array('class', 'dir', 'id', 'style', 'title'), + 'font' => array('class', 'dir', 'id', 'style', 'title', // deprecated element + 'color', 'face', 'size'); // deprecated attribute + 'h1' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute + 'h2' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute + 'h3' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute + 'h4' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute + 'h5' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute + 'h6' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute + 'hr' => array('class', 'dir', 'id', 'style', 'title', + 'align', 'noshade', 'size', 'width'), // deprecated attribute + 'i' => array('class', 'dir', 'id', 'style', 'title'), + 'img' => array('class', 'dir', 'id', 'style', 'title', + 'src', 'alt', 'height', 'width'), + 'ins' => array('class', 'dir', 'id', 'style', 'title', + 'cite', 'datetime'), + 'li' => array('class', 'dir', 'id', 'style', 'title', + 'type'), // deprecated attribute + 'ol' => array('class', 'dir', 'id', 'style', 'title', + 'type'), // deprecated attribute + 'p' => array('class', 'dir', 'id', 'style', 'title', + 'align'), // deprecated attribute + 'pre' => array('class', 'dir', 'id', 'style', 'title', + 'width'), // deprecated attribute + 'strong' => array('class', 'dir', 'id', 'style', 'title'), + 'table' => array('class', 'dir', 'id', 'style', 'title', + 'border', 'cellpadding', 'cellspacing', 'frame', 'rules', 'summary', 'width', + 'align', 'bgcolor'), // deprecated attribute + 'td' => array('class', 'dir', 'id', 'style', 'title', + 'align', 'colspan', 'headers', 'rowspan', 'scope', 'valign', + 'bgcolor', 'height', 'nowrap', 'width'), // deprecated attribute + 'th' => array('class', 'dir', 'id', 'style', 'title', + 'align', 'colspan', 'rowspan', 'scope', 'valign', + 'bgcolor', 'height', 'nowrap', 'width'), // deprecated attribute + 'tr' => array('class', 'dir', 'id', 'style', 'title', + 'align', 'valign', + 'bgcolor'), // deprecated attribute + 'ul' => array('class', 'dir', 'id', 'style', 'title', + 'type'), // deprecated attribute ); // tags which should always be self-closing (e.g. "") public $no_close = array( From c421919092a322018e8a85685fbc8ce8a1f5ada9 Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Wed, 1 Jun 2011 11:20:03 +0200 Subject: [PATCH 3/3] Fix php syntax --- src/IDF/Template/MarkdownPrefilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IDF/Template/MarkdownPrefilter.php b/src/IDF/Template/MarkdownPrefilter.php index 11c2643..ec88859 100644 --- a/src/IDF/Template/MarkdownPrefilter.php +++ b/src/IDF/Template/MarkdownPrefilter.php @@ -110,7 +110,7 @@ class IDF_Template_MarkdownPrefilter extends Pluf_Text_HTML_Filter 'dt' => array('class', 'dir', 'id', 'style', 'title'), 'em' => array('class', 'dir', 'id', 'style', 'title'), 'font' => array('class', 'dir', 'id', 'style', 'title', // deprecated element - 'color', 'face', 'size'); // deprecated attribute + 'color', 'face', 'size'), // deprecated attribute 'h1' => array('class', 'dir', 'id', 'style', 'title', 'align'), // deprecated attribute 'h2' => array('class', 'dir', 'id', 'style', 'title',