Merge branch 'master' into ubuntu-master

[deb/packages.git] / templates / html / show.tmpl

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 19f5b7e474bfaee94967d6d6abecd2d03207125e..d81d1e88afaa54e3ff6d410be8a8fe0018f99e1b 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -56,13 +56,16 @@
 [% ELSE %]
 <h1>[% g('Package: %s (%s)', pkg, versions.short) %]
 [% END %]
-[%- PROCESS marker text=archive title=mirrors.$archive.title IF archive && archive != main_archive %]
-[%- PROCESS marker text=section title=section_titles.$section IF section && section != main_section %]
-[%- PROCESS marker text=g('essential') title=g('package manager will refuse to remove this package by default') IF page.get_newest('essential') == 'yes' %]</h1>
+[%- PROCESS marker text=archive title=mirrors.$archive.title url=mirrors.$archive.url IF archive && archive != main_archive %]
+[%- PROCESS marker text=section title=section_titles.$section url=section_urls.$section IF section && section != main_section %]
+[%- PROCESS marker text=g('essential') title=g('package manager will refuse to remove this package by default') url='http://www.debian.org/doc/debian-policy/ch-binary.html#s3.8' IF page.get_newest('essential') == 'yes' %]</h1>
 
 [% UNLESS is_virtual %]
 <div id="pmoreinfo">
 <h2>[% g('Links for %s', pkg) %]</h2>
+[% IF screenshots_url && screenshots_thumb_url && !is_source %]
+<a id="screenshot" href="[% screenshots_url _ pkg %]"><img src="[% "$screenshots_thumb_url/$pkg/$version" %]" alt="Screenshot" border="0"/></a>
+[% END %]
 <h3>[% g('%s Resources:', organisation) %]</h3>
 <ul>
 <li><a href="[% launchpad_url _ (is_source ? pkg : src.pkg) _ '/+bugs' %]">[% g('Bug Reports') %]</a></li>
@@ -86,14 +89,14 @@
 
 [% IF patch_tracking_url && src %]
   [% FOREACH src.downloads %]
-    [% IF name.match('\.diff\.(gz|bz2|lzma)$') %]
-    <li><a href="[% "$patch_tracking_url/$src.pkg/$src.version" %]">[% g("%s Patch Tracking", organisation) %]</a></li>
+    [% IF name.match('\.(debian\.tar|diff)\.(gz|xz|bz2|lzma)$') %]
+    <li><a href="[% "$patch_tracking_url/$src.pkg/$src.version" %]">[% g("%s Patch Tracker", organisation) %]</a></li>
     [% END -%]
   [% END -%]
 [% ELSIF patch_tracking_url && is_source %]
   [% FOREACH srcfiles %]
-    [% IF filename.match('\.diff\.(gz|bz2|lzma)$') %]
-    <li><a href="[% "$patch_tracking_url/$pkg/$version" %]">[% g("%s Patch Tracking", organisation) %]</a></li>
+    [% IF filename.match('\.(debian\.tar|diff)\.(gz|xz|bz2|lzma)$') %]
+    <li><a href="[% "$patch_tracking_url/$pkg/$version" %]">[% g("%s Patch Tracker", organisation) %]</a></li>
     [% END -%]
   [% END -%]
 [% END -%]
@@ -339,7 +342,7 @@
        version_class = 'vold';
    END %]
 [% "<td class='$version_class'>$d.version</td>" IF versions.multiple %]
-<td class="size">[% g('%s&nbsp;kB', num.format_number(d.pkgsize,1)) %]</td><td class="size">[% g('%s&nbsp;kB', d.instsize) %]</td>
+<td class="size">[% g('%s&nbsp;kB', num.format_number(d.pkgsize,1)) %]</td><td class="size">[% g('%s&nbsp;kB', num.format_number(d.instsize,1)) %]</td>
 <td>
 [% IF d.contents_avail %]
   [<a href="[% make_url(filelist_url,'','arch',d.arch) %]">[% g('list of files') %]</a>]