From ce1f58bdbcd2c3dc4faa6b07863ac4636c1a0566 Mon Sep 17 00:00:00 2001 From: "olav%bkor.dhs.org" <> Date: Fri, 20 Oct 2006 02:23:16 +0000 Subject: Bug 72863: Remove ugly table shown when posting/changing a bug Patch by Olav Vitters r+a=justdave --- skins/standard/global.css | 10 +++++ template/en/default/attachment/created.html.tmpl | 54 +++++++++++------------ template/en/default/attachment/updated.html.tmpl | 29 +++++------- template/en/default/bug/process/bugmail.html.tmpl | 16 +++---- template/en/default/bug/process/results.html.tmpl | 45 +++++++------------ template/en/default/filterexceptions.pl | 7 +-- 6 files changed, 74 insertions(+), 87 deletions(-) diff --git a/skins/standard/global.css b/skins/standard/global.css index a2a25c717..b00ec851b 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -270,3 +270,13 @@ table#flags td { margin: 1em; padding: 0.5em 1em; } + +dt { + font-weight: bolder; +} +body > dl > dt { + border-top: dotted gray thin; +} +dl dl > dt { + border-top: none; +} 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; }" %] - - - - - -
-

- Attachment #[% attachid %] - to [% terms.Bug %] #[% bugid %] Created -

+
+
+ Attachment #[% attachid %] + to [% "$terms.bug $bugid" FILTER bug_link(bugid) %] created +
+
+ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] + [% IF convertedbmp %] +

+ Note: [% terms.Bugzilla %] automatically converted your BMP image file to a + compressed PNG format. +

+ [% END %] + [% IF contenttypemethod == 'autodetect' %] +

+ Note: [% terms.Bugzilla %] automatically detected the content type + [% contenttype %] for this attachment. If this is + incorrect, correct the value by + editing the attachment's details. +

+ [% END %] - [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] - [% IF convertedbmp %] -

- Note: [% terms.Bugzilla %] automatically converted your BMP image file to a - compressed PNG format. -

- [% END %] - [% IF contenttypemethod == 'autodetect' %] -

- Note: [% terms.Bugzilla %] automatically detected the content type - [% contenttype %] for this attachment. If this is - incorrect, correct the value by - editing the attachment's details. -

- [% END %] -
- Go back to [% terms.bug %] #[% bugid %] -
+ [%# Links to more information about the changed bug. %] + [% Hook.process("links") %] + +

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; }" %] -

- - - - - - - -
-

Changes to - attachment [% attachid %] - of [% terms.bug %] [%+ bugid %] submitted -

- [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] - 		- Back to [% terms.Bug %] #[% bugid %] -
+
+
Changes to + attachment [% attachid %] + of [% "$terms.bug $bugid" FILTER bug_link(bugid) %] submitted +
+
+ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] + [%# Links to more information about the changed bug. %] + [% Hook.process("links") %] +
+
[% 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) %] +
[% PROCESS emails description = "Email sent to" names = mail.sent %] -
+ [% PROCESS emails description = "Excluding" names = mail.excluded %] -
-
- If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can - change your preferences. -
- +
[%############################################################################%] [%# Block for a set of email addresses #%] [%############################################################################%] [% BLOCK emails %] - [% description FILTER html %]: +
[% description FILTER html %]:
+
[% IF user.can_see_bug(mailing_bugid) %] [% IF names.size > 0 %] [%+ FOREACH name = names %] - [% name FILTER html %][% ", " UNLESS loop.last() %] + [% name FILTER html %][% ", " UNLESS loop.last() %] [% END %] [% ELSE %] no one @@ -73,4 +70,5 @@ [% ELSE %] (list of e-mails not available) [% END %] +
[% 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" , } %] - - - - - -
-

[% title.$type %]

- [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %] - 		- [% linktext.$type %] - [%# Links to more information about the changed bug. %] - [% Hook.process("links") %] -
+
+
[% title.$type %]
+
+ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %] + [%# Links to more information about the changed bug. %] + [% Hook.process("links") %] +
+
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' => [ -- cgit v1.2.3-24-g4f1b