diff options
Diffstat (limited to 'template/en')
7 files changed, 13 insertions, 19 deletions
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 %] <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"> 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 @@ </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"> 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 <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> 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 %] </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 %]"> 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 %] </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 %] 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 @@ <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> |