diff options
| author | David Lawrence <dlawrence@mozilla.com> | 2011-09-10 22:09:15 +0200 |
|---|---|---|
| committer | David Lawrence <dlawrence@mozilla.com> | 2011-09-10 22:09:15 +0200 |
| commit | f6e81df17967ab414235bcc12d3432df69192f1a (patch) | |
| tree | fc67e2919844dd4a9f46cfceb5fbde3fe89375ea /template | |
| parent | d3144ccde7c1d3c432baaf43fe0b79a6c30eb7b0 (diff) | |
| parent | 87c4a3b9273bbeb04e7c4aa8d06a12186f744fb7 (diff) | |
| download | bugzilla-f6e81df17967ab414235bcc12d3432df69192f1a.tar.gz bugzilla-f6e81df17967ab414235bcc12d3432df69192f1a.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/email/bugmail.html.tmpl | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index 5e81efa6a..f48667e7b 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -39,7 +39,7 @@ </div> [% END %] </p> - + <hr> <span>You are receiving this mail because:</span> <ul> @@ -58,40 +58,41 @@ </html> [% BLOCK generate_diffs %] - - [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %] - + [% SET in_table = 0 %] [% last_changer = "" %] - <table border="1" cellspacing="0" cellpadding="2"> [% FOREACH change = diffs %] [% IF !isnew && change.who.login != last_changer %] [% last_changer = change.who.login %] + [% IF in_table == 1 %] + </table> + [% SET in_table = 0 %] + [% END %] [% IF change.blocker %] - <tr> - <td colspan="3"> [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %] depends on [% "${terms.bug} ${change.blocker.id}" FILTER bug_link(change.blocker, full_url => 1) FILTER none %], which changed state. - </td> - </tr> [% ELSE %] - <tr> - <td colspan="3"> [% INCLUDE global/user.html.tmpl who = change.who %] - changed: - </td> - </tr> + changed [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %] [% END %] - <tr> - <th>What</th> - <th>Removed</th> - <th>Added</th> - </tr> + <br> + [% IF in_table == 0 %] + <table border="1" cellspacing="0" cellpadding="8"> + [% SET in_table = 1 %] + [% END %] + <tr> + <th>What</th> + <th>Removed</th> + <th>Added</th> + </tr> [% END %] [% PROCESS "email/bugmail-common.txt.tmpl" %] - + [% IF in_table == 0 %] + <table border="1" cellspacing="0" cellpadding="8"> + [% SET in_table = 1 %] + [% END %] [% IF isnew %] <tr> <th>[% field_label FILTER html %]</th> |