diff options
Diffstat (limited to 'template/en/default/bug')
| -rw-r--r-- | template/en/default/bug/process/bugmail.html.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/bug/process/results.html.tmpl | 45 |
2 files changed, 24 insertions, 37 deletions
diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl index 557f091a1..670c2b04e 100644 --- a/template/en/default/bug/process/bugmail.html.tmpl +++ b/template/en/default/bug/process/bugmail.html.tmpl @@ -40,32 +40,29 @@ [% mail = SendBugMail(mailing_bugid, mailrecipients) %] +<dl> [% PROCESS emails description = "Email sent to" names = mail.sent %] -<br> + [% PROCESS emails description = "Excluding" names = mail.excluded %] -<br> -<center> - If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can - <a href="userprefs.cgi?tab=email">change your preferences</a>. -</center> - +</dl> [%############################################################################%] [%# Block for a set of email addresses #%] [%############################################################################%] [% BLOCK emails %] - <b>[% description FILTER html %]:</b> + <dt>[% description FILTER html %]:</dt> + <dd> [% IF user.can_see_bug(mailing_bugid) %] [% IF names.size > 0 %] [%+ FOREACH name = names %] - [% name FILTER html %][% ", " UNLESS loop.last() %] + <code>[% name FILTER html %]</code>[% ", " UNLESS loop.last() %] [% END %] [% ELSE %] no one @@ -73,4 +70,5 @@ [% ELSE %] (list of e-mails not available) [% END %] + </dd> [% END %] diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl index a21858792..9265a44dc 100644 --- a/template/en/default/bug/process/results.html.tmpl +++ b/template/en/default/bug/process/results.html.tmpl @@ -37,36 +37,25 @@ [% DEFAULT type="bug" %] +[% Link = BLOCK %][% "$terms.Bug $id" FILTER bug_link(id) %][% END %] +[% link = BLOCK %][% "$terms.bug $id" FILTER bug_link(id) %][% END %] + [% title = { - 'bug' => "Changes submitted for $terms.bug $id" , - 'dupe' => "Duplicate notation added to $terms.bug $id" , - 'dep' => "Checking for dependency changes on $terms.bug $id" , - 'votes' => "$terms.Bug $id confirmed by number of votes" , - 'created' => "$terms.Bug $id has been added to the database" , - 'move' => "$terms.Bug $id has been moved to another database" , - } - - linktext = { - 'bug' => "Back To $terms.Bug $id" , - 'dupe' => "Go To $terms.Bug $id" , - 'dep' => "Go To $terms.Bug $id" , - 'votes' => "Go To $terms.Bug $id" , - 'created' => "Go To $terms.Bug $id" , - 'move' => "Back To $terms.Bug $id" , + 'bug' => "Changes submitted for $link" , + 'dupe' => "Duplicate notation added to $link" , + 'dep' => "Checking for dependency changes on $link" , + 'votes' => "$Link confirmed by number of votes" , + 'created' => "$Link has been added to the database" , + 'move' => "$Link has been moved to another database" , } %] -<table border="1"> - <tr> - <td> - <h2>[% title.$type %]</h2> - [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %] - </td> - <td> - <a href="show_bug.cgi?id=[% id %]">[% linktext.$type %]</a> - [%# Links to more information about the changed bug. %] - [% Hook.process("links") %] - </td> - </tr> -</table> +<dl> + <dt>[% title.$type %]</dt> + <dd> + [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %] + [%# Links to more information about the changed bug. %] + [% Hook.process("links") %] + </dd> +</dl> |