aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkiko%async.com.br <>2004-07-27 22:54:03 +0000
committerkiko%async.com.br <>2004-07-27 22:54:03 +0000
commitbc9e63eff68258eeed0e0cc043f48c362183411f (patch)
tree3d84e51d01738d644217847342e442a470f2823a
parentfba06c0a5f82ddf2f73ef068752d697666464dc1 (diff)
downloadbugs-bc9e63eff68258eeed0e0cc043f48c362183411f.tar
bugs-bc9e63eff68258eeed0e0cc043f48c362183411f.tar.gz
bugs-bc9e63eff68258eeed0e0cc043f48c362183411f.tar.bz2
bugs-bc9e63eff68258eeed0e0cc043f48c362183411f.tar.xz
bugs-bc9e63eff68258eeed0e0cc043f48c362183411f.zip
Fix for bug 252943: broken title in interdiff. Adds reasonable title while
doing an interdiff, and fixes some broken and confusing double-linking in the text. r=joel, a=justdave.
-rw-r--r--template/en/default/attachment/diff-header.html.tmpl11
1 files changed, 8 insertions, 3 deletions
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index ff0f414a7..3d96d0f70 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -24,7 +24,11 @@
[% PROCESS global/variables.none.tmpl %]
[% title = BLOCK %]
- Attachment #[% attachid %] for [% terms.Bug %] #[% bugid %]
+ [% IF attachid %]
+Attachment #[% attachid %] for [% terms.Bug %] #[% bugid %]
+ [% ELSE %]
+Interdiff of #[% oldid %] and #[% newid %] for #[% terms.Bug %] #[% bugid %]
+ [% END %]
[% END %]
[% style = BLOCK %]
@@ -187,14 +191,15 @@ tbody.file pre:empty {
[% IF attachid %]
[% description FILTER html %] (#[% attachid %])
[% ELSE %]
+ [% USE url %]
[% old_url = url('attachment.cgi', action = 'diff', id = oldid) %]
[% new_url = url('attachment.cgi', action = 'diff', id = newid) %]
Diff Between
<a href="[% old_url %]">[% old_desc FILTER html %]</a>
- (<a href="[% old_url %]">#[% oldid %]</a>)
+ (#[% oldid %])
and
<a href="[% new_url %]">[% new_desc FILTER html %]</a>
- (<a href="[% new_url %]">#[% newid %]</a>)
+ (#[% newid %])
[% END %]
for <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a>
[% END %]