summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Pyrzak <guy.pyrzak@gmail.com>2011-09-07 07:29:59 +0200
committerGuy Pyrzak <guy.pyrzak@gmail.com>2011-09-07 07:29:59 +0200
commita7f759820a4c19032e19b3f204542a69f623897f (patch)
tree7d875676b686a17742dd23155950e84953bd606f
parentbf9156ad5f0a57a467dd46292efb2f0a47ec845e (diff)
downloadbugzilla-a7f759820a4c19032e19b3f204542a69f623897f.tar.gz
bugzilla-a7f759820a4c19032e19b3f204542a69f623897f.tar.xz
Bug 604237 - Clean up the format of HTML Emails
r=mkanat, a=mkanat
-rw-r--r--template/en/default/email/bugmail.html.tmpl41
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..55ba37ad4 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 %]
+ [% in_table %]</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">[% in_table%]
+ [% SET in_table = 1 %]
+ [% END %]
[% IF isnew %]
<tr>
<th>[% field_label FILTER html %]</th>