diff options
Diffstat (limited to 'extensions/BugModal/template')
3 files changed, 9 insertions, 25 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index 340bb6f81..08c6b5b64 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -244,17 +244,8 @@ [% END %] [% BLOCK comment_body %] - [% IF comment.is_markdown %] - [% comment_tag = 'div' %] - [% ELSE %] - [% comment_tag = 'pre' %] - [% END %] - - <[% comment_tag FILTER none %] class="comment-text [%= "bz_private" IF comment.is_private %]" - id="ct-[% comment.count FILTER none %]" - data-uniqueid="[% comment.id FILTER none %]" - [% IF comment.is_markdown +%] data-ismarkdown="true" [% END ~%] - [% IF comment.collapsed +%] style="display:none"[% END ~%] + <pre class="comment-text [%= "bz_private" IF comment.is_private %]" id="ct-[% comment.count FILTER none %]" + [% IF comment.collapsed +%] style="display:none"[% END ~%] >[% FILTER collapse %] [% IF comment.is_about_attachment && comment.attachment.is_image ~%] <a href="attachment.cgi?id=[% comment.attachment.id FILTER none %]" @@ -262,7 +253,7 @@ class="lightbox"><img src="extensions/BugModal/web/image.png" width="16" height="16"></a> [% END %] [% END %] - [%~ comment.body_full FILTER renderComment(bug, comment) ~%]</[% comment_tag FILTER none %]> + [%~ comment.body_full FILTER quoteUrls(bug, comment) ~%]</pre> [% END %] [% diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index e2e8bc124..e926c04b4 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -202,7 +202,7 @@ no_label = 1 hide_on_edit = 1 %] - <h1 id="field-value-short_desc">[% bug.short_desc FILTER renderComment(bug, undef, 1) FILTER wbr %]</h1> + <h1 id="field-value-short_desc">[% bug.short_desc FILTER quoteUrls(bug) FILTER wbr %]</h1> [% END %] [%# alias %] @@ -1191,7 +1191,7 @@ [% END %] </div> [% END %] - <div id="user-story" class="comment-text">[% bug.cf_user_story FILTER renderComment(bug, undef) %]</div> + <pre id="user-story">[% bug.cf_user_story FILTER quoteUrls(bug) %]</pre> [% IF user.id %] <textarea id="cf_user_story" name="cf_user_story" style="display:none" rows="10" cols="80"> [%~ bug.cf_user_story FILTER html ~%] diff --git a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl index 63c8cf197..63663b4d5 100644 --- a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl @@ -45,19 +45,12 @@ <textarea rows="5" cols="80" name="comment" id="comment" aria-labelledby="comment-edit-tab"></textarea> </div> <div id="comment-preview-tabpanel" class="comment-tabpanel" role="tabpanel" aria-labelledby="comment-preview-tab" style="display:none"> - <div id="comment-preview" class="comment-text"></div> + <pre id="comment-preview" class="comment-text"></pre> </div> - <div id="add-comment-tips"> - <div id="comment-markdown-tip"> - <img src="extensions/BMO/web/images/notice.png" width="16" height="16"> - <a href="https://guides.github.com/features/mastering-markdown/" target="_blank">Markdown styling now supported</a> - </div> - - <div id="bugzilla-etiquette"> - <a href="page.cgi?id=etiquette.html" target="_blank" tabindex="-1"> - Comments Subject to Etiquette and Contributor Guidelines</a> - </div> + <div id="bugzilla-etiquette"> + <a href="page.cgi?id=etiquette.html" target="_blank" tabindex="-1"> + Comments Subject to Etiquette and Contributor Guidelines</a> </div> <div id="after-comment-commit-button"> |