summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/attachment/created.html.tmpl54
-rw-r--r--template/en/default/attachment/updated.html.tmpl29
-rw-r--r--template/en/default/bug/process/bugmail.html.tmpl16
-rw-r--r--template/en/default/bug/process/results.html.tmpl45
-rw-r--r--template/en/default/filterexceptions.pl7
5 files changed, 64 insertions, 87 deletions
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 3114b2963..e6037bcba 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -32,38 +32,34 @@
[% PROCESS global/header.html.tmpl
title = "Changes Submitted"
- style = "th { text-align: left; }"
%]
-<table border="1">
- <tr>
- <td>
- <h2>
- <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&amp;action=edit">Attachment #[% attachid %]</a>
- to <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a> Created
- </h2>
+<dl>
+ <dt>
+ <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&amp;action=edit">Attachment #[% attachid %]</a>
+ to [% "$terms.bug $bugid" FILTER bug_link(bugid) %] created
+ </dt>
+ <dd>
+ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
+ [% IF convertedbmp %]
+ <p>
+ <b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a
+ compressed PNG format.
+ </p>
+ [% END %]
+ [% IF contenttypemethod == 'autodetect' %]
+ <p>
+ <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
+ <em>[% contenttype %]</em> for this attachment. If this is
+ incorrect, correct the value by
+ editing the attachment's <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">details</a>.
+ </p>
+ [% END %]
- [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
- [% IF convertedbmp %]
- <p>
- <b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a
- compressed PNG format.
- </p>
- [% END %]
- [% IF contenttypemethod == 'autodetect' %]
- <p>
- <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
- <em>[% contenttype %]</em> for this attachment. If this is
- incorrect, correct the value by
- editing the attachment's <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">details</a>.
- </p>
- [% END %]
- </td>
- <td>
- <a href="show_bug.cgi?id=[% bugid %]">Go back to [% terms.bug %] #[% bugid %]</a>
- </td>
- </tr>
-</table>
+ [%# Links to more information about the changed bug. %]
+ [% Hook.process("links") %]
+ </dd>
+</dl>
<p>
<a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index de56341e0..a66b74e17 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -29,25 +29,18 @@
[% PROCESS global/header.html.tmpl
title = "Changes Submitted"
- style = "th { text-align: left; }"
%]
-<hr>
-
-<table border="1">
- <tr>
- <td>
- <h2>Changes to
- <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">attachment [% attachid %]</a>
- of [% terms.bug %] [%+ bugid %] submitted
- </h2>
- [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
- </td>
-
- <td>
- <a href="show_bug.cgi?id=[% bugid %]">Back to [% terms.Bug %] #[% bugid %]</a>
- </td>
- </tr>
-</table>
+<dl>
+ <dt>Changes to
+ <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">attachment [% attachid %]</a>
+ of [% "$terms.bug $bugid" FILTER bug_link(bugid) %] submitted
+ </dt>
+ <dd>
+ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
+ [%# Links to more information about the changed bug. %]
+ [% Hook.process("links") %]
+ </dd>
+</dl>
[% PROCESS global/footer.html.tmpl %]
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>
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index a2d4b4d2b..b88c44757 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -390,8 +390,8 @@
'bug/process/results.html.tmpl' => [
'title.$type',
- 'id',
- 'linktext.$type',
+ '"$terms.Bug $id" FILTER bug_link(id)',
+ '"$terms.bug $id" FILTER bug_link(id)',
],
'bug/create/create.html.tmpl' => [
@@ -429,6 +429,7 @@
'attachid',
'bugid',
'contenttype',
+ '"$terms.bug $bugid" FILTER bug_link(bugid)',
],
'attachment/edit.html.tmpl' => [
@@ -450,7 +451,7 @@
'attachment/updated.html.tmpl' => [
'attachid',
- 'bugid',
+ '"$terms.bug $bugid" FILTER bug_link(bugid)',
],
'attachment/diff-header.html.tmpl' => [