From 380b6e527cfb9cc98e6e40849915e2627fa2d0ae Mon Sep 17 00:00:00 2001 From: "kiko%async.com.br" <> Date: Wed, 17 Mar 2004 07:52:47 +0000 Subject: 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 to use new classes and clean up callsites. Patch by byron jones . r=myk, gerv. a=myk. --- template/en/default/attachment/list.html.tmpl | 2 +- template/en/default/attachment/show-multiple.html.tmpl | 6 +----- template/en/default/bug/dependency-tree.html.tmpl | 6 +++--- template/en/default/bug/votes/list-for-user.html.tmpl | 5 ++--- template/en/default/filterexceptions.pl | 2 +- template/en/default/list/edit-multiple.html.tmpl | 6 +++--- template/en/default/reports/duplicates-table.html.tmpl | 5 ++--- 7 files changed, 13 insertions(+), 19 deletions(-) (limited to 'template') diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl index 1ef6cab12..8558a5959 100644 --- a/template/en/default/attachment/list.html.tmpl +++ b/template/en/default/attachment/list.html.tmpl @@ -36,7 +36,7 @@ [% IF !attachment.isprivate || canseeprivate %] - [% attachment.description FILTER html %] + [% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %] diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index 48f03dff1..bcfae488d 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -46,11 +46,7 @@ - [% IF a.isobsolete %] - [% a.description FILTER html %] - [% ELSE %] - [% a.description FILTER html %] - [% END %] + [% a.description FILTER html FILTER obsolete(a.isobsolete) %] diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index b0da74a17..a5bdcce27 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -26,7 +26,6 @@ [% PROCESS global/header.html.tmpl title = "Dependency tree for $terms.Bug $bugid" h1 = "Dependency tree for $terms.Bug $bugid" - style = "strike { background-color: #d9d9d9; color: #000000; }" %] [% PROCESS depthControlToolbar %] @@ -92,7 +91,8 @@
  • [% "" IF dep.dependencies.size > 0 && !dep.seen %] - [% "" IF !dep.open %] + [% isclosed = !dep.open %] + [% FILTER closed(isclosed) %] [% dep_id %] [[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %] [% dep.assignee_email FILTER html %]] - @@ -101,7 +101,7 @@ [% ELSE %] [% dep.summary FILTER html %]. [% END %] - [% "" IF !dep.open %] + [% END %] [% INCLUDE display_tree bug_id=dep_id IF dep.dependencies.size > 0 && !dep.seen %]
    • diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl index d7214349c..27551f19d 100644 --- a/template/en/default/bug/votes/list-for-user.html.tmpl +++ b/template/en/default/bug/votes/list-for-user.html.tmpl @@ -89,10 +89,9 @@ [% END %] - [% "" IF NOT bug.opened %] + [% isclosed = !bug.opened %] - [% bug.id %] - [% "" IF NOT bug.opened %] + [% bug.id FILTER closed(isclosed) %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 05b52c5b8..1c74c3b89 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -197,7 +197,7 @@ 'list/edit-multiple.html.tmpl' => [ 'group.id', 'group.description', - 'group.description FILTER strike', + 'group.description FILTER inactive', 'knum', 'menuname', ], diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 1d758e58e..d3c23ce66 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -219,7 +219,7 @@ [% IF group.isactive %] [% group.description %] [% ELSE %] - [% group.description FILTER strike %] + [% group.description FILTER inactive %] [% END %] @@ -229,8 +229,8 @@ [% IF foundinactive %] - (Note: [% terms.Bugs %] may not be added to inactive - groups, only removed.)
    + (Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive + groups[% END %], only removed.)
    [% END %] [% END %] diff --git a/template/en/default/reports/duplicates-table.html.tmpl b/template/en/default/reports/duplicates-table.html.tmpl index f8ea3a457..6017a1e4e 100644 --- a/template/en/default/reports/duplicates-table.html.tmpl +++ b/template/en/default/reports/duplicates-table.html.tmpl @@ -120,9 +120,8 @@
    - [% "" IF bug.resolution != "" %] - [% bug.id %] - [% "" IF bug.resolution != "" %] + [% isclosed = bug.resolution != "" %] + [% bug.id FILTER closed(isclosed) %]
    -- cgit v1.2.1