X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=templates%2Fhtml%2Fshow.tmpl;h=d81d1e88afaa54e3ff6d410be8a8fe0018f99e1b;hb=2cbbd4fcf8594eb2c92e94a948ad01acb770e223;hp=e86af33a9c5342981f4de2886e785a3c0a9af784;hpb=b78c30f44448bff7b33468f266ca4bd963ae89bb;p=deb%2Fpackages.git

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index e86af33..d81d1e8 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -64,17 +64,11 @@
 <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>
+<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="[% (is_source ? src_bugs_url : bugs_url) _ pkg %]">[% g('Bug Reports') %]</a></li>
-
-[% IF src.pkg -%]
-<li><a href="[% pts_url _ src.pkg %]">[% g('Developer Information (PTS)') %]</a></li>
-[% ELSIF is_source %]
-<li><a href="[% pts_url _ pkg %]">[% g('Developer Information (PTS)') %]</a></li>
-[%- END %]
+<li><a href="[% launchpad_url _ (is_source ? pkg : src.pkg) _ '/+bugs' %]">[% g('Bug Reports') %]</a></li>
 
 [% IF files && (!archive or archive == main_archive or archive == 'security') %]
 <li><a href="[% changelogs_url _ files.changelog.path %]">[% g('%s Changelog', organisation) %]</a></li>
@@ -95,13 +89,13 @@
 
 [% IF patch_tracking_url && src %]
   [% FOREACH src.downloads %]
-    [% IF name.match('\.(debian\.tar|diff)\.(gz|bz2|lzma)$') %]
+    [% 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('\.(debian\.tar|diff)\.(gz|bz2|lzma)$') %]
+    [% 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 -%]
@@ -121,12 +115,7 @@
   [% END %]
 [% END %]
 
-[% IF maintainers.size == 1 -%]
-  <h3>[% g('Maintainer:') %]</h3>
-[%- ELSE -%]
-  <h3>[% g('Maintainers:') %]</h3>
-[%- END %]
-[%- FOREACH maintainers;
+[%- BLOCK handle_maintainer;
   mailarchiveurl = '';
   IF (matches = mail.match('^(.*)@lists\.debian\.org$'));
 	mailarchiveurl = 'http://lists.debian.org/' _ uri_escape(matches.0) _ '/';
@@ -135,12 +124,43 @@
   ELSIF (matches = mail.match('^(.*)@lists\.ubuntu\.com$'));
   	mailarchiveurl = 'http://lists.ubuntu.com/archives/' _ uri_escape(matches.0) _ '/';
   END -%]
-  [%- '<ul>' IF loop.first -%]
+  [% IF hide_mail %]
+	<li>[% name | html %]
+  [% ELSE %]
 	<li><a href="mailto:[% mail | html %]">[% name | html %]</a>
-	(<a href="[% ddpo_url %][% uri_escape(mail) %]" title="[% g("An overview over the maintainer's packages and uploads") %]">[% g('QA&nbsp;Page') %]</a>
-	[%- IF mailarchiveurl %], <a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail&nbsp;Archive') %]</a>[% END %])
+  [% END %]
+	[%- IF mailarchiveurl %] (<a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail&nbsp;Archive') %]</a>)[% END %]
 	</li>
-  [%- '</ul>' IF loop.last -%]
+[% END -%]
+
+[%- IF maintainers.size -%]
+[% IF maintainers.size == 1 -%]
+  <h3>[% g('Maintainer:') %]</h3>
+[%- ELSE -%]
+  <h3>[% g('Maintainers:') %]</h3>
+[%- END %]
+[%- FOREACH m IN maintainers;
+   '<ul>' IF loop.first;
+   PROCESS handle_maintainer name=m.name mail=m.mail;
+   '</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/" _ (is_source ? pkg : src.pkg) _ "/+filebug",
+        "https://answers.launchpad.net/ubuntu/+source/" _ (is_source ? pkg : src.pkg) _ "/+addquestion") %]</p>
+[%- END -%]
+
+[%- IF original_maintainers.size -%]
+[% IF original_maintainers.size == 1 -%]
+  <h3>[% g('Original Maintainer (usually from Debian):') %]</h3>
+[%- ELSE -%]
+  <h3>[% g('Original Maintainers (usually from Debian):') %]</h3>
+[%- END %]
+[%- FOREACH m IN original_maintainers;
+   '<ul>' IF loop.first;
+   PROCESS handle_maintainer name=m.name mail=m.mail hide_mail=1;
+   '</ul>' IF loop.last;
+ END -%]
+<p>[% g('It should generally not be necessary for users to contact the original maintainer.') %]</p>
 [%- END -%]
 
 [% url = page.get_newest('url');
@@ -322,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>]