X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fhtml%2Fshow.tmpl;h=00effc9c98cfa637d238404b0e3a7d5f970a5ce0;hb=5bc68216fc09af79aa6b21b43f43a5a62e215267;hp=048b7d0d6d72f62116b67dfa34b8672d8694ce69;hpb=ca605dba77e7901e6b99a59fe8d8a9de776614b7;p=deb%2Fpackages.git

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 048b7d0..00effc9 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -63,7 +63,7 @@
 [% UNLESS is_virtual %]
 <div id="pmoreinfo">
 <h2>[% g('Links for %s', pkg) %]</h2>
-<h3>[% g('Debian Resources:') %]</h3>
+<h3>[% g('%s Resources:', organisation) %]</h3>
 <ul>
 <li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg %]">[% g('Bug Reports') %]</a></li>
 
@@ -86,9 +86,9 @@
 	SET vcs_info = page.get_newest("x-vcs-$vcs_id") UNLESS vcs_info;
    IF vcs_info %]
  (<a href="[% vcs_info %]" class="pvcslink">[% vcs_name %]</a>)
-[% END %]
-</li>
 [% END; END %]
+</li>
+[% END %]
 
 </ul>
 
@@ -115,10 +115,12 @@
 	mailarchiveurl = 'http://lists.debian.org/' _ matches.0 _ '/';
   ELSIF (matches = mail.match('^(.*)@lists\.alioth\.debian\.org$'));
 	mailarchiveurl = 'http://lists.alioth.debian.org/pipermail/' _ matches.0 _ '/';
+  ELSIF (matches = mail.match('^(.*)@lists\.ubuntu\.com$'));
+  	mailarchiveurl = 'http://lists.ubuntu.com/archives/' _ matches.0 _ '/';
   END -%]
   [%- '<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><a href="mailto:[% mail | uri %]">[% name | html %]</a>
+	(<a href="[% ddpo_url %][% mail | uri %]" title="[% g("An overview over the maintainer's packages and uploads") %]">[% g('QA Page') %]</a>
 	[%- IF mailarchiveurl %], <a href="[% mailarchiveurl %]" title="[% g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive') %]</a>[% END %])
 	</li>
   [%- '</ul>' IF loop.last -%]
@@ -342,16 +344,21 @@
 	vcs_id = vcs.0; vcs_name = vcs.1; vcs_pkg = vcs.2;
 	vcs_info = page.get_newest("vcs-$vcs_id");
 	SET vcs_info = page.get_newest("x-vcs-$vcs_id") UNLESS vcs_info;
-	IF vcs_info; %]
+	LAST IF vcs_info;
+   END;
+   IF vcs_info || vcs_link; %]
 <dl>
+[% IF vcs_info %]
 <dt>[% g('Debian Package Source Repository (<acronym title="Version Control System">VCS</acronym>: <a href="%s">%s</a>)',
 	make_url(vcs_pkg,'','source',''), vcs_name ) %]</dt>
 <dd><a href="[% vcs_info %]" class="pvcslink">[% vcs_info %]</a></dd>
-[% IF vcs_link %]
-<dt>[% g('Debian Package Source Repository (Browsable)') %]</dt><dd><a href="[% vcs_link %]" class="pvcslink">[% vcs_link %]</a></dd>
+[% END;
+   IF vcs_link %]
+<dt>[% g('Debian Package Source Repository (Browsable)') %]</dt>
+<dd><a href="[% vcs_link %]" class="pvcslink">[% vcs_link %]</a></dd>
 [% END %]
 </dl>
-[% END; END %]
+[% END %]
 
     </div> <!-- end pdownload -->
   [%- END %]