X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=templates%2Fhtml%2Fshow.tmpl;h=9b31bb2c31f7c9a451a8952abe8c0fad6b695316;hb=13dc7ea813815f5583d4e31c98fd1f8d932bb46d;hp=ec7f2d7deec38950d6e8a6b1cb20f02c19144544;hpb=aa2e0fe2326ca54e2cc46959968ba6234f105e25;p=deb%2Fpackages.git

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index ec7f2d7..9b31bb2 100644
--- 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 %]" 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|diff)\.(gz|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|diff)\.(gz|bz2|lzma)$') %]
+    <li><a href="[% "$patch_tracking_url/$pkg/$version" %]">[% g("%s Patch Tracker", organisation) %]</a></li>
     [% END -%]
   [% END -%]
 [% END -%]
@@ -142,8 +145,8 @@
    '</ul>' IF loop.last;
  END -%]
 <p>[% g('Please consider <a href="%s">filing a bug</a> or <a href="%s">asking a question</a> via Launchpad before contacting the maintainer directly.',
-        "https://bugs.launchpad.net/ubuntu/+source/$src.pkg/+filebug",
-        "https://answers.launchpad.net/ubuntu/+source/$src.pkg/+addquestion") %]</p>
+        "https://bugs.launchpad.net/ubuntu/+source/" _ (is_source ? pkg : src.pkg) _ "/+filebug",
+        "https://answers.launchpad.net/ubuntu/+source/" _ (is_source ? pkg : src.pkg) _ "/+addquestion") %]</p>
 [%- END -%]
 
 [%- IF original_maintainers.size -%]