зеркало из https://github.com/mozilla/gecko-dev.git
Fix for bug 232397: .bz_obsolete shouldn't specify "underline". Define
specific bz_obsolete/closed/inactive classes (that don't specify underline, but line-through instead) and additional Template filters for conveniently applying them. Change occurences of <strike> to use new classes and clean up callsites. Patch by byron jones <bugzilla@glob.com.au>. r=myk, gerv. a=myk.
This commit is contained in:
Родитель
6114e65bf5
Коммит
06e65cf6b9
|
@ -195,8 +195,35 @@ sub create {
|
|||
# built-in filter, please also add a stub filter to checksetup.pl
|
||||
# and t/004template.t.
|
||||
FILTERS => {
|
||||
# Render text in strike-through style.
|
||||
strike => sub { return "<strike>" . $_[0] . "</strike>" },
|
||||
|
||||
# Render text in required style.
|
||||
|
||||
inactive => [
|
||||
sub {
|
||||
my($context, $isinactive) = @_;
|
||||
return sub {
|
||||
return $isinactive ? '<span class="bz_inactive">'.$_[0].'</span>' : $_[0];
|
||||
}
|
||||
}, 1
|
||||
],
|
||||
|
||||
closed => [
|
||||
sub {
|
||||
my($context, $isclosed) = @_;
|
||||
return sub {
|
||||
return $isclosed ? '<span class="bz_closed">'.$_[0].'</span>' : $_[0];
|
||||
}
|
||||
}, 1
|
||||
],
|
||||
|
||||
obsolete => [
|
||||
sub {
|
||||
my($context, $isobsolete) = @_;
|
||||
return sub {
|
||||
return $isobsolete ? '<span class="bz_obsolete">'.$_[0].'</span>' : $_[0];
|
||||
}
|
||||
}, 1
|
||||
],
|
||||
|
||||
# Returns the text with backslashes, single/double quotes,
|
||||
# and newlines/carriage returns escaped for use in JS strings.
|
||||
|
|
|
@ -1178,7 +1178,9 @@ END
|
|||
# These don't actually need to do anything here, just exist
|
||||
FILTERS =>
|
||||
{
|
||||
strike => sub { return $_; } ,
|
||||
inactive => sub { return $_; } ,
|
||||
closed => sub { return $_; },
|
||||
obsolete => sub { return $_; },
|
||||
js => sub { return $_; },
|
||||
html_linebreak => sub { return $_; },
|
||||
url_quote => sub { return $_; },
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
.bz_private { color: darkred ; background : #f3eeee ; }
|
||||
.bz_disabled { color: #a0a0a0 ; }
|
||||
|
||||
.bz_obsolete { text-decoration: line-through underline; }
|
||||
.bz_obsolete { text-decoration: line-through; }
|
||||
.bz_inactive { text-decoration: line-through; }
|
||||
.bz_closed { text-decoration: line-through; }
|
||||
|
||||
table#flags th, table#flags td { vertical-align: baseline; text-align: left; }
|
||||
|
|
|
@ -351,8 +351,8 @@ if ($action eq 'list') {
|
|||
my $s = "";
|
||||
my $e = "";
|
||||
if ($disabledtext) {
|
||||
$s = "<STRIKE>";
|
||||
$e = "</STRIKE>";
|
||||
$s = '<span class="bz_inactive">';
|
||||
$e = '</span>';
|
||||
}
|
||||
$realname = ($realname ? html_quote($realname) : "<FONT COLOR=\"red\">missing</FONT>");
|
||||
print "<TR>\n";
|
||||
|
|
|
@ -1034,9 +1034,9 @@ sub GetBugLink {
|
|||
$post = "</i>";
|
||||
}
|
||||
elsif (! IsOpenedState($bug_state)) {
|
||||
$pre = "<strike>";
|
||||
$pre = '<span class="bz_closed">';
|
||||
$title .= " $bug_res";
|
||||
$post = "</strike>";
|
||||
$post = '</span>';
|
||||
}
|
||||
if (CanSeeBug($bug_num, $::userid)) {
|
||||
$title .= " - $bug_desc";
|
||||
|
|
|
@ -94,7 +94,9 @@ foreach my $include_path (@include_paths) {
|
|||
{
|
||||
html_linebreak => sub { return $_; },
|
||||
js => sub { return $_ } ,
|
||||
strike => sub { return $_ } ,
|
||||
inactive => sub { return $_; } ,
|
||||
closed => sub { return $_; },
|
||||
obsolete => sub { return $_; },
|
||||
url_quote => sub { return $_ } ,
|
||||
css_class_quote => sub { return $_ } ,
|
||||
xml => sub { return $_ } ,
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
[% IF !attachment.isprivate || canseeprivate %]
|
||||
<tr [% "class=\"bz_private\"" IF attachment.isprivate %]>
|
||||
<td valign="top">
|
||||
<a href="attachment.cgi?id=[% attachment.attachid %]&action=view" [% "class=\"bz_obsolete\"" IF attachment.isobsolete %]>[% attachment.description FILTER html %]</a>
|
||||
<a href="attachment.cgi?id=[% attachment.attachid %]&action=view">[% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %]</a>
|
||||
</td>
|
||||
|
||||
<td valign="top">
|
||||
|
|
|
@ -46,11 +46,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td valign="top">
|
||||
[% IF a.isobsolete %]
|
||||
<strike>[% a.description FILTER html %]</strike>
|
||||
[% ELSE %]
|
||||
[% a.description FILTER html %]
|
||||
[% END %]
|
||||
[% a.description FILTER html FILTER obsolete(a.isobsolete) %]
|
||||
</td>
|
||||
|
||||
<td valign="top">
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
[% PROCESS global/header.html.tmpl
|
||||
title = "Dependency tree for $terms.Bug $bugid"
|
||||
h1 = "Dependency tree for <a href=\"show_bug.cgi?id=$bugid\">$terms.Bug $bugid</a>"
|
||||
style = "strike { background-color: #d9d9d9; color: #000000; }"
|
||||
%]
|
||||
|
||||
[% PROCESS depthControlToolbar %]
|
||||
|
@ -92,7 +91,8 @@
|
|||
<li>
|
||||
[% "<script>document.write('<a href=\"#\" class=\"toggle\" onclick=\"listToggle(event); return false\">[-]</a>')</script>"
|
||||
IF dep.dependencies.size > 0 && !dep.seen %]
|
||||
[% "<strike>" IF !dep.open %]
|
||||
[% isclosed = !dep.open %]
|
||||
[% FILTER closed(isclosed) %]
|
||||
<a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %]
|
||||
[[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %]
|
||||
[% dep.assignee_email FILTER html %]] -
|
||||
|
@ -101,7 +101,7 @@
|
|||
[% ELSE %]
|
||||
[% dep.summary FILTER html %].</a>
|
||||
[% END %]
|
||||
[% "</strike>" IF !dep.open %]
|
||||
[% END %]
|
||||
[% INCLUDE display_tree bug_id=dep_id
|
||||
IF dep.dependencies.size > 0 && !dep.seen %]
|
||||
</li>
|
||||
|
|
|
@ -89,10 +89,9 @@
|
|||
[% END %]
|
||||
</td>
|
||||
<td align="right">
|
||||
[% "<strike>" IF NOT bug.opened %]
|
||||
[% isclosed = !bug.opened %]
|
||||
<a href="show_bug.cgi?id=[% bug.id %]">
|
||||
[% bug.id %]</a>
|
||||
[% "</strike>" IF NOT bug.opened %]
|
||||
[% bug.id FILTER closed(isclosed) %]</a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="votes.cgi?action=show_bug&bug_id=[% bug.id %]">
|
||||
|
|
|
@ -197,7 +197,7 @@
|
|||
'list/edit-multiple.html.tmpl' => [
|
||||
'group.id',
|
||||
'group.description',
|
||||
'group.description FILTER strike',
|
||||
'group.description FILTER inactive',
|
||||
'knum',
|
||||
'menuname',
|
||||
],
|
||||
|
|
|
@ -219,7 +219,7 @@
|
|||
[% IF group.isactive %]
|
||||
[% group.description %]
|
||||
[% ELSE %]
|
||||
[% group.description FILTER strike %]
|
||||
[% group.description FILTER inactive %]
|
||||
[% END %]
|
||||
</td>
|
||||
|
||||
|
@ -229,8 +229,8 @@
|
|||
</table>
|
||||
|
||||
[% IF foundinactive %]
|
||||
<font size="-1">(Note: [% terms.Bugs %] may not be added to <strike>inactive
|
||||
groups</strike>, only removed.)</font><br>
|
||||
<font size="-1">(Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive
|
||||
groups[% END %], only removed.)</font><br>
|
||||
[% END %]
|
||||
|
||||
[% END %]
|
||||
|
|
|
@ -120,9 +120,8 @@
|
|||
<tr [% "class='resolved'" IF bug.resolution != "" %]>
|
||||
<td>
|
||||
<center>
|
||||
[% "<strike>" IF bug.resolution != "" %]
|
||||
<a href="show_bug.cgi?id=[% bug.id %]">[% bug.id %]</a>
|
||||
[% "</strike>" IF bug.resolution != "" %]
|
||||
[% isclosed = bug.resolution != "" %]
|
||||
<a href="show_bug.cgi?id=[% bug.id %]">[% bug.id FILTER closed(isclosed) %]</a>
|
||||
</center>
|
||||
</td>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче