html/show.tmpl: Some fixes to the Vcs-* handling

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

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index b8cc43e97cfeedda8f62381fc15f0912712099fe..00effc9c98cfa637d238404b0e3a7d5f970a5ce0 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -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>
 
@@ -119,8 +119,8 @@
        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 -%]
@@ -344,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 %]