diff options
author | Koosha KM <koosha.khajeh@gmail.com> | 2014-08-28 19:17:54 +0200 |
---|---|---|
committer | David Lawrence <dkl@mozilla.com> | 2014-08-28 19:17:54 +0200 |
commit | ec5caa57cc14a328b8b994d49cb8def8eb95aea7 (patch) | |
tree | 08eec320a2361b41fcd400259770d6357a913e15 /template/en/default/bug | |
parent | 82346032ecfef148e78a8d19e17c5ed41ed41d10 (diff) | |
download | bugzilla-ec5caa57cc14a328b8b994d49cb8def8eb95aea7.tar.gz bugzilla-ec5caa57cc14a328b8b994d49cb8def8eb95aea7.tar.xz |
Bug 330707: Add optional support for MarkDown
r=dkl,a=sgreen
Diffstat (limited to 'template/en/default/bug')
-rw-r--r-- | template/en/default/bug/comment.html.tmpl | 8 | ||||
-rw-r--r-- | template/en/default/bug/comments.html.tmpl | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/template/en/default/bug/comment.html.tmpl b/template/en/default/bug/comment.html.tmpl index 96cbb63ed..7feb6dfa4 100644 --- a/template/en/default/bug/comment.html.tmpl +++ b/template/en/default/bug/comment.html.tmpl @@ -35,3 +35,11 @@ <pre id="comment_preview_text" class="bz_comment_text"></pre> </div> [% END %] + +[% IF feature_enabled('markdown') AND user.settings.use_markdown.value == 'on' %] + <div id="comment_markdown"> + <input type="checkbox" name="use_markdown" id="use_markdown" value="1" + [% "checked=\"checked\"" IF user.settings.use_markdown.value == 'on' %] > + <label id="use_markdown_label" for="use_markdown">Use Markdown for this [% terms.comment %]</label> + </div> +[% END %] diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index d040e651d..8f5742fee 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -229,7 +229,7 @@ [% IF mode == "edit" || comment.collapsed %] id="comment_text_[% comment.count FILTER none %]" [% END %]> - [%- comment_text FILTER quoteUrls(bug, comment) -%] + [%- comment_text FILTER markdown(bug, comment) -%] </pre> [% Hook.process('a_comment-end', 'bug/comments.html.tmpl') %] </div> |