summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/account/prefs/email.html.tmpl43
-rw-r--r--template/en/default/bug/edit.html.tmpl34
2 files changed, 68 insertions, 9 deletions
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 3fcb86176..ef8d0ae29 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -45,7 +45,10 @@
function SetCheckboxes(setting) {
for (var count = 0; count < document.userprefsform.elements.length; count++) {
var theinput = document.userprefsform.elements[count];
- if (theinput.type == "checkbox" && !theinput.disabled) {
+ if (theinput.type == "checkbox"
+ && !theinput.disabled
+ && !theinput.name.match("remove_ignored_bug"))
+ {
if (theinput.name.match("neg")) {
theinput.checked = !setting;
}
@@ -285,6 +288,40 @@ You are currently not watching any users.
[% END %]
</p>
-<hr>
+<b>Ignore [% terms.Bugs %]</b>
-<br>
+<p>
+ You can specify a list of [% terms.bugs %] from which you never want to get
+ any email notification of any kind by adding their ID(s) as a comma-separated
+ list. Removing [% terms.abug %] by selecting it from the current ignored list
+ will re-enable email notifications for the [% terms.bug %].
+</p>
+[% IF user.bugs_ignored.size %]
+ <p>
+ You are currently ignoring:
+ <table>
+ [% FOREACH bug = user.bugs_ignored %]
+ <tr>
+ <td>
+ <input type="checkbox" name="remove_ignored_bug_[% bug.id FILTER html %]" value="1">
+ </td>
+ <td><a href="[% urlbase FILTER html %]show_bug.cgi?id=[% bug.id FILTER uri %]">
+ [% bug.id FILTER html %]</a>
+ </td>
+ <td>[% bug.status FILTER html %]</td>
+ <td>
+ [% IF user.can_see_bug(bug.id) %]
+ - [% bug.summary FILTER html %]
+ [% ELSE %]
+ (private)
+ [% END %]
+ </td>
+ </tr>
+ [% END %]
+ </table>
+ </p>
+[% END %]
+
+<p>Add [% terms.bugs %]:<br>
+ <input type="text" id="add_ignored_bugs"
+ name="add_ignored_bugs" size="60"></p>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index c48b17c08..4c39b7cc3 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -92,19 +92,21 @@
<table cellpadding="3" cellspacing="1">
[%# *** Reported and modified dates *** %]
[% PROCESS section_dates %]
-
+
[% PROCESS section_cclist %]
-
+
+ [% PROCESS section_bug_ignored %]
+
[% PROCESS section_spacer %]
[% PROCESS section_see_also %]
-
+
[% PROCESS section_customfields %]
-
+
[% PROCESS section_spacer %]
-
+
[% Hook.process("after_custom_fields") %]
-
+
[% PROCESS section_flags %]
</table>
@@ -819,6 +821,26 @@
[% END %]
[%############################################################################%]
+[%# Block for Bug Ignored #%]
+[%############################################################################%]
+[% BLOCK section_bug_ignored %]
+ [% IF user.id %]
+ <tr>
+ <th class="field_label">
+ <label for="bug_ignored" title="Ignore all email for this [% terms.bug %]">
+ Ignore [% terms.Bug %] Mail:
+ </label>
+ </th>
+ <td>
+ <input type="hidden" name="defined_bug_ignored" value="1">
+ <input type="checkbox" name="bug_ignored" id="bug_ignored" value="1"
+ [% ' checked="checked"' IF user.is_bug_ignored(bug.id) %]>
+ </td>
+ </tr>
+ [% END %]
+[% END %]
+
+[%############################################################################%]
[%# Block for See Also #%]
[%############################################################################%]
[% BLOCK section_see_also %]