зеркало из https://github.com/mozilla/pjs.git
Bug 72863: Remove ugly table shown when posting/changing a bug
Patch by Olav Vitters <olav@bkor.dhs.org> r+a=justdave
This commit is contained in:
Родитель
4beb472193
Коммит
0db2fabd02
|
@ -270,3 +270,13 @@ table#flags td {
|
||||||
margin: 1em;
|
margin: 1em;
|
||||||
padding: 0.5em 1em;
|
padding: 0.5em 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dt {
|
||||||
|
font-weight: bolder;
|
||||||
|
}
|
||||||
|
body > dl > dt {
|
||||||
|
border-top: dotted gray thin;
|
||||||
|
}
|
||||||
|
dl dl > dt {
|
||||||
|
border-top: none;
|
||||||
|
}
|
||||||
|
|
|
@ -32,38 +32,34 @@
|
||||||
|
|
||||||
[% PROCESS global/header.html.tmpl
|
[% PROCESS global/header.html.tmpl
|
||||||
title = "Changes Submitted"
|
title = "Changes Submitted"
|
||||||
style = "th { text-align: left; }"
|
|
||||||
%]
|
%]
|
||||||
|
|
||||||
<table border="1">
|
<dl>
|
||||||
<tr>
|
<dt>
|
||||||
<td>
|
<a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&action=edit">Attachment #[% attachid %]</a>
|
||||||
<h2>
|
to [% "$terms.bug $bugid" FILTER bug_link(bugid) %] created
|
||||||
<a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&action=edit">Attachment #[% attachid %]</a>
|
</dt>
|
||||||
to <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a> Created
|
<dd>
|
||||||
</h2>
|
[% 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 %]&action=edit">details</a>.
|
||||||
|
</p>
|
||||||
|
[% END %]
|
||||||
|
|
||||||
[% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
|
[%# Links to more information about the changed bug. %]
|
||||||
[% IF convertedbmp %]
|
[% Hook.process("links") %]
|
||||||
<p>
|
</dd>
|
||||||
<b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a
|
</dl>
|
||||||
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 %]&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>
|
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create
|
<a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create
|
||||||
|
|
|
@ -29,25 +29,18 @@
|
||||||
|
|
||||||
[% PROCESS global/header.html.tmpl
|
[% PROCESS global/header.html.tmpl
|
||||||
title = "Changes Submitted"
|
title = "Changes Submitted"
|
||||||
style = "th { text-align: left; }"
|
|
||||||
%]
|
%]
|
||||||
|
|
||||||
<hr>
|
<dl>
|
||||||
|
<dt>Changes to
|
||||||
<table border="1">
|
<a href="attachment.cgi?id=[% attachid %]&action=edit">attachment [% attachid %]</a>
|
||||||
<tr>
|
of [% "$terms.bug $bugid" FILTER bug_link(bugid) %] submitted
|
||||||
<td>
|
</dt>
|
||||||
<h2>Changes to
|
<dd>
|
||||||
<a href="attachment.cgi?id=[% attachid %]&action=edit">attachment [% attachid %]</a>
|
[% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
|
||||||
of [% terms.bug %] [%+ bugid %] submitted
|
[%# Links to more information about the changed bug. %]
|
||||||
</h2>
|
[% Hook.process("links") %]
|
||||||
[% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
|
</dd>
|
||||||
</td>
|
</dl>
|
||||||
|
|
||||||
<td>
|
|
||||||
<a href="show_bug.cgi?id=[% bugid %]">Back to [% terms.Bug %] #[% bugid %]</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
[% PROCESS global/footer.html.tmpl %]
|
[% PROCESS global/footer.html.tmpl %]
|
||||||
|
|
|
@ -40,32 +40,29 @@
|
||||||
|
|
||||||
[% mail = SendBugMail(mailing_bugid, mailrecipients) %]
|
[% mail = SendBugMail(mailing_bugid, mailrecipients) %]
|
||||||
|
|
||||||
|
<dl>
|
||||||
[% PROCESS emails
|
[% PROCESS emails
|
||||||
description = "Email sent to"
|
description = "Email sent to"
|
||||||
names = mail.sent
|
names = mail.sent
|
||||||
%]
|
%]
|
||||||
<br>
|
|
||||||
[% PROCESS emails
|
[% PROCESS emails
|
||||||
description = "Excluding"
|
description = "Excluding"
|
||||||
names = mail.excluded
|
names = mail.excluded
|
||||||
%]
|
%]
|
||||||
<br>
|
</dl>
|
||||||
<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>
|
|
||||||
|
|
||||||
|
|
||||||
[%############################################################################%]
|
[%############################################################################%]
|
||||||
[%# Block for a set of email addresses #%]
|
[%# Block for a set of email addresses #%]
|
||||||
[%############################################################################%]
|
[%############################################################################%]
|
||||||
|
|
||||||
[% BLOCK emails %]
|
[% BLOCK emails %]
|
||||||
<b>[% description FILTER html %]:</b>
|
<dt>[% description FILTER html %]:</dt>
|
||||||
|
<dd>
|
||||||
[% IF user.can_see_bug(mailing_bugid) %]
|
[% IF user.can_see_bug(mailing_bugid) %]
|
||||||
[% IF names.size > 0 %]
|
[% IF names.size > 0 %]
|
||||||
[%+ FOREACH name = names %]
|
[%+ FOREACH name = names %]
|
||||||
[% name FILTER html %][% ", " UNLESS loop.last() %]
|
<code>[% name FILTER html %]</code>[% ", " UNLESS loop.last() %]
|
||||||
[% END %]
|
[% END %]
|
||||||
[% ELSE %]
|
[% ELSE %]
|
||||||
no one
|
no one
|
||||||
|
@ -73,4 +70,5 @@
|
||||||
[% ELSE %]
|
[% ELSE %]
|
||||||
(list of e-mails not available)
|
(list of e-mails not available)
|
||||||
[% END %]
|
[% END %]
|
||||||
|
</dd>
|
||||||
[% END %]
|
[% END %]
|
||||||
|
|
|
@ -37,36 +37,25 @@
|
||||||
|
|
||||||
[% DEFAULT type="bug" %]
|
[% DEFAULT type="bug" %]
|
||||||
|
|
||||||
|
[% Link = BLOCK %][% "$terms.Bug $id" FILTER bug_link(id) %][% END %]
|
||||||
|
[% link = BLOCK %][% "$terms.bug $id" FILTER bug_link(id) %][% END %]
|
||||||
|
|
||||||
[%
|
[%
|
||||||
title = {
|
title = {
|
||||||
'bug' => "Changes submitted for $terms.bug $id" ,
|
'bug' => "Changes submitted for $link" ,
|
||||||
'dupe' => "Duplicate notation added to $terms.bug $id" ,
|
'dupe' => "Duplicate notation added to $link" ,
|
||||||
'dep' => "Checking for dependency changes on $terms.bug $id" ,
|
'dep' => "Checking for dependency changes on $link" ,
|
||||||
'votes' => "$terms.Bug $id confirmed by number of votes" ,
|
'votes' => "$Link confirmed by number of votes" ,
|
||||||
'created' => "$terms.Bug $id has been added to the database" ,
|
'created' => "$Link has been added to the database" ,
|
||||||
'move' => "$terms.Bug $id has been moved to another database" ,
|
'move' => "$Link 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" ,
|
|
||||||
}
|
}
|
||||||
%]
|
%]
|
||||||
|
|
||||||
<table border="1">
|
<dl>
|
||||||
<tr>
|
<dt>[% title.$type %]</dt>
|
||||||
<td>
|
<dd>
|
||||||
<h2>[% title.$type %]</h2>
|
[% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %]
|
||||||
[% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %]
|
[%# Links to more information about the changed bug. %]
|
||||||
</td>
|
[% Hook.process("links") %]
|
||||||
<td>
|
</dd>
|
||||||
<a href="show_bug.cgi?id=[% id %]">[% linktext.$type %]</a>
|
</dl>
|
||||||
[%# Links to more information about the changed bug. %]
|
|
||||||
[% Hook.process("links") %]
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
|
@ -390,8 +390,8 @@
|
||||||
|
|
||||||
'bug/process/results.html.tmpl' => [
|
'bug/process/results.html.tmpl' => [
|
||||||
'title.$type',
|
'title.$type',
|
||||||
'id',
|
'"$terms.Bug $id" FILTER bug_link(id)',
|
||||||
'linktext.$type',
|
'"$terms.bug $id" FILTER bug_link(id)',
|
||||||
],
|
],
|
||||||
|
|
||||||
'bug/create/create.html.tmpl' => [
|
'bug/create/create.html.tmpl' => [
|
||||||
|
@ -429,6 +429,7 @@
|
||||||
'attachid',
|
'attachid',
|
||||||
'bugid',
|
'bugid',
|
||||||
'contenttype',
|
'contenttype',
|
||||||
|
'"$terms.bug $bugid" FILTER bug_link(bugid)',
|
||||||
],
|
],
|
||||||
|
|
||||||
'attachment/edit.html.tmpl' => [
|
'attachment/edit.html.tmpl' => [
|
||||||
|
@ -450,7 +451,7 @@
|
||||||
|
|
||||||
'attachment/updated.html.tmpl' => [
|
'attachment/updated.html.tmpl' => [
|
||||||
'attachid',
|
'attachid',
|
||||||
'bugid',
|
'"$terms.bug $bugid" FILTER bug_link(bugid)',
|
||||||
],
|
],
|
||||||
|
|
||||||
'attachment/diff-header.html.tmpl' => [
|
'attachment/diff-header.html.tmpl' => [
|
||||||
|
|
Загрузка…
Ссылка в новой задаче