summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl22
-rw-r--r--extensions/RestrictComments/template/en/default/hook/bug/edit-after_comment_commit_button.html.tmpl11
2 files changed, 29 insertions, 4 deletions
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 17bf38200..282b750d8 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
@@ -52,6 +52,8 @@
<div id="after-comment-commit-button">
[% Hook.process("after_comment_commit_button", 'bug/edit.html.tmpl') %]
+ [%# this checkboxes are in tables to match the alignment of the
+ added-by-extensions checkboxes (needinfo, restrict-comments) %]
[% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
[%
IF user.settings.state_addselfcc.value == 'always';
@@ -66,13 +68,11 @@
check_add_self = 0;
END;
%]
- [%# this is in a table to match the alignment of the added-by-extensions
- checkboxes (needinfo, restrict-comments) %]
<table>
<tr>
<td>
<input type="checkbox" name="addselfcc" id="add-self-cc"
- [%~ " checked" IF check_add_self %]>
+ [%= "checked" IF check_add_self %]>
</td>
<td>
<label for="add-self-cc">Add me to CC list (follow this [% terms.bug %])</label>
@@ -80,5 +80,21 @@
</tr>
</table>
[% END %]
+
+ [% IF user.is_involved_in_bug(bug) %]
+ <table class="edit-show" style="display:none">
+ <tr>
+ <td>
+ <input type="checkbox" name="bug_ignored" id="bug-ignored"
+ [%= "checked" IF user.is_bug_ignored(bug.id) %]>
+ </td>
+ <td>
+ <label for="bug-ignored" title="You will still receive emails for flag requests directed at you">
+ Never email me about this [% terms.bug %]
+ </label>
+ </td>
+ </tr>
+ </table>
+ [% END %]
</div>
</div>
diff --git a/extensions/RestrictComments/template/en/default/hook/bug/edit-after_comment_commit_button.html.tmpl b/extensions/RestrictComments/template/en/default/hook/bug/edit-after_comment_commit_button.html.tmpl
index c5250c8c2..ab2d79f62 100644
--- a/extensions/RestrictComments/template/en/default/hook/bug/edit-after_comment_commit_button.html.tmpl
+++ b/extensions/RestrictComments/template/en/default/hook/bug/edit-after_comment_commit_button.html.tmpl
@@ -10,7 +10,7 @@
[% RETURN UNLESS user.in_group(Param('restrict_comments_enable_group')) %]
[%# using a table to match alignment of the needinfo checkboxes %]
-<table>
+<table [%= IF bug_modal %]class="edit-show" style="display:none"[% END %]>
<tr>
<td>
<input type="checkbox" name="restrict_comments" id="restrict_comments"
@@ -24,3 +24,12 @@
</td>
</tr>
</table>
+[% IF bug_modal && bug.restrict_comments %]
+ <table class="edit-hide">
+ <tr>
+ <td>
+ <i>Commenting restricted to members of the <b>[% Param('restrict_comments_group') FILTER html %]</b> group.</i>
+ </td>
+ </tr>
+ </table>
+[% END %]