diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-12-06 18:28:00 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-12-06 18:28:00 +0100 |
| commit | ce665b1f88150f437c7bb893bf3ebeabc3f04f07 (patch) | |
| tree | f28bd6e20fc74672c4a10d6eec2eac2aec719065 /extensions/BMO/template/en/default/email | |
| parent | 07f5353454ce64657544640eca84dd06769dd8a3 (diff) | |
| download | bugzilla-ce665b1f88150f437c7bb893bf3ebeabc3f04f07.tar.gz bugzilla-ce665b1f88150f437c7bb893bf3ebeabc3f04f07.tar.xz | |
Bug 869989: Add X-Bugzilla-Mentors field to bugmail headers and an indication to mentors in bugmail body
Diffstat (limited to 'extensions/BMO/template/en/default/email')
| -rw-r--r-- | extensions/BMO/template/en/default/email/bugmail.html.tmpl | 31 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/email/bugmail.txt.tmpl | 9 |
2 files changed, 24 insertions, 16 deletions
diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl index 094b0c579..a6d2b340c 100644 --- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl +++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl @@ -73,21 +73,26 @@ <div id="bug_details" style="font-size: 90%; color: #666666"> <hr style="border: 1px dashed #969696"> - Product/Component: [% bug.product FILTER html %] :: [% bug.component FILTER html %] + Product/Component: [% bug.product FILTER html %] :: [% bug.component FILTER html %]<br> + [% "You are mentoring this " _ terms.bug IF bug.is_mentor(to_user) %] </div> -[% IF tracking_flags.size %] - <div id="tracking" style="font-size: 90%; color: #666666"> - <hr style="border: 1px dashed #969696"> - <b>Tracking Flags:</b> - <ul> - [% FOREACH flag = tracking_flags %] - [% NEXT IF bug.${flag.name} == "---" %] - <li>[% flag.description FILTER html %]:[% bug.${flag.name} FILTER html %]</li> - [% END %] - </ul> - </div> -[% END %] + [% seen_header = 0 %] + [% FOREACH flag = tracking_flags %] + [% NEXT IF bug.${flag.name} == "---" %] + [% IF !seen_header %] + [% seen_header = 1 %] + <div id="tracking" style="font-size: 90%; color: #666666"> + <hr style="border: 1px dashed #969696"> + <b>Tracking Flags:</b> + <ul> + [% END %] + <li>[% flag.description FILTER html %]:[% bug.${flag.name} FILTER html %]</li> + [% END %] + [% IF seen_header %] + </ul> + </div> + [% END %] <div id="reason" style="font-size: 90%; color: #666666"> <hr style="border: 1px dashed #969696"> diff --git a/extensions/BMO/template/en/default/email/bugmail.txt.tmpl b/extensions/BMO/template/en/default/email/bugmail.txt.tmpl index ed74ad880..b0e8636a4 100644 --- a/extensions/BMO/template/en/default/email/bugmail.txt.tmpl +++ b/extensions/BMO/template/en/default/email/bugmail.txt.tmpl @@ -38,14 +38,17 @@ Configure [% terms.bug %]mail: [% urlbase %]userprefs.cgi?tab=email ------------------------------- Product/Component: [%+ bug.product +%] :: [%+ bug.component %] +[%+ "You are mentoring this " _ terms.bug IF bug.is_mentor(to_user) %] -[% IF tracking_flags.size %] -------- Tracking Flags: ------- +[% seen_header = 0 %] [% FOREACH flag = tracking_flags %] [% NEXT IF bug.${flag.name} == "---" %] + [% IF !seen_header %] + [% seen_header = 1 %] +------- Tracking Flags: ------- + [% END %] [%+ flag.description %]:[% bug.${flag.name} %] [% END %] -[% END %] ------- You are receiving this mail because: ------- [% SET reason_lines = [] %] |