X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=templates%2Fhtml%2Fshow.tmpl;h=8f04246934cd9e78ca4ef89be5f8af6c511dca3d;hb=bc4124c53d65b5ddf5a0504d0479b06aa7cfcb8b;hp=edca00bb3750d8831f65e4291a89122860f5b5a1;hpb=5b4300c691bdea12227a957d4aa7b738e30d4d0d;p=deb%2Fpackages.git

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index edca00b..8f04246 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -64,13 +64,7 @@
 <h2>[% g('Links for %s', pkg) %]</h2>
 <h3>[% g('Debian Resources:') %]</h3>
 <ul>
-<li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg | uri %]">[% g('Bug Reports') %]</a></li>
-
-[% IF src.pkg -%]
-<li><a href="[% pts_url _ src.pkg | uri %]">[% g('Developer Information (PTS)') %]</a></li>
-[% ELSIF is_source %]
-<li><a href="[% pts_url _ pkg | uri %]">[% g('Developer Information (PTS)') %]</a></li>
-[%- END %]
+<li><a href="[% launchpad_url _ (is_source ? pkg : src.pkg) _ '/+bugs' | uri %]">[% 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>
@@ -110,9 +104,7 @@
 [%- END %]
 [%- FOREACH maintainers -%]
   [%- '<ul>' IF loop.first -%]
-	<li><a href="mailto:[% mail %]">[% name | html %]</a>
-	(<a href="[% ddpo_url _ mail %]" title="[% g("An overview over the maintainer's packages and uploads") %]">[% g('QA Page') %]</a>)
-	</li>
+	<li><a href="mailto:[% mail %]">[% name | html %]</a></li>
   [%- '</ul>' IF loop.last -%]
 [%- END -%]
 
@@ -143,16 +135,13 @@
 [% changelog_link = 'changelog';
    changelog_link = "$changelogs_url$files.changelog.path" %] 
 <h2>[% g('Experimental package') %]</h2>
-<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution.
-That means it is likely unstable or buggy, and it may even cause data loss.
-Please be sure to consult the <a href="%s">changelog</a> and other possible documentation before
-using it.', changelog_link) %]</p>
+<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution. That means it is likely unstable or buggy, and it may even cause data loss. Please be sure to consult the <a href="%s">changelog</a> and other possible documentation before using it.',
+	changelog_link) %]</p>
 [% END %]
 [% IF subsection == "debian-installer" %]
 <h2>[% g('debian-installer udeb package') %]</h2>
-<p>[% g('Warning: This package is intended for the use in building
-<a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only.
-Do not install it on a normal %s system.', organisation ) %]</p>
+<p>[% g('Warning: This package is intended for the use in building <a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only. Do not install it on a normal %s system.',
+	organisation ) %]</p>
 [% END %]
 </div>
 [% END %]
@@ -242,7 +231,11 @@ Do not install it on a normal %s system.', organisation ) %]</p>
       [%- IF !is_old_pkgs -%]
         <dd>[% desc -%]
         [%- IF providers.pkgs.size > 0 -%]
-          [% '<br>also a ' IF providers.also %][% g('virtual package provided by') %]
+	  [% IF providers.also;
+		'<br>' _ g('also a virtual package provided by');
+	     ELSE;
+		g('virtual package provided by');
+	     END; %]
 	  [% js_id = name %]
 	    <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]">[% FOREACH provider IN providers.pkgs %]<a href="[% make_url(provider,'','suite',suite,'source','') %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
 	[% IF providers.pkgs.size > 10 %]