X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=templates%2Fhtml%2Fshow.tmpl;h=43e5ca1c891690b3f5ca2f61170530607143188c;hb=41ab743eae0a7875cf03a8b50a060da06af30b39;hp=b0929244cc33fa09c5dd4c6e5dda82a89ab020b6;hpb=078ddbf7006d957bbef2daa9735ec9a8bf3d8fcd;p=deb%2Fpackages.git

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index b092924..43e5ca1 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -23,7 +23,6 @@
    [%- END -%]
    [%- '</div>' IF loop.last -%]
 [% END %]
-</div>
 
 [% IF src %]
 <div id="psource">
@@ -42,7 +41,76 @@
 [% END %]
 [%- PROCESS marker text=archive IF archive && archive != main_archive %]
 [%- PROCESS marker text=subsection IF subsection == 'non-US' and archive != 'non-US' %]
-[%- PROCESS marker text=section IF section && section != main_section %]</h1>
+[%- PROCESS marker text=section IF section && section != main_section %]
+[%- PROCESS marker text='essential' IF page.get_newest('essential') == 'yes' %]</h1>
+
+[% UNLESS is_virtual %]
+<div id="pmoreinfo">
+<h2>Links for [% pkg %]</h2>
+<h3>Debian Resources:</h3>
+<ul>
+<li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg | uri %]">Bug Reports</a></li>
+
+[% IF src -%]
+<li><a href="[% pts_url _ src.pkg | uri %]">Developer Information (PTS)</a></li>
+[% ELSIF is_source %]
+<li><a href="[% pts_url _ pkg | uri %]">Developer Information (PTS)</a></li>
+[%- END %]
+
+[% IF files %]
+<li><a href="[% changelogs_url _ files.changelog.path %]">Debian Changelog</a></li>
+<li><a href="[% changelogs_url _ files.copyright.path %]">Copyright File</a></li>
+[% END %]
+</ul>
+
+[% #FIXME: should this only be used for the PTS?
+   known_vcs = [ [ 'cvs', 'CVS' ],
+		[ 'svn', 'Subversion' ],
+		[ 'bzr', 'bzr' ],
+		[ 'darcs', 'Darcs'],
+		[ 'arch', 'arch' ] ];
+   FOREACH vcs IN known_vcs;
+	vcs_id = vcs.0; vcs_name = vcs.1;
+	vcs_info = page.get_newest("vcs-$vcs_id");
+	SET vcs_info = page.get_newest("x-vcs-$vcs_id") UNLESS vcs_info;
+	IF vcs_info; %]
+<p>Debian Package Repository (<acronym title="Version Control System">VCS</acronym>: [% vcs_name %]):<br> <a href="[% vcs_info %]" class="pvcslink">[% vcs_info %]</a></p>
+[% END; END %]
+
+[% IF src %]
+  <p>Download Source Package <a href="[% src.url %]">[% src.pkg %]</a>:
+  [% FOREACH src.downloads %]
+    [% '<ul>' IF loop.first %]
+    <li><a href="[% server _ path %]">[[% name %]]</a></li>
+    [% '</ul>' IF loop.last %]
+  [% END %]
+  [% IF src.downloads.size == 0 %]
+  Not found
+  [% END %]
+[% END %]
+
+[% IF maintainers.size == 1 -%]
+  <h3>Maintainer:</h3>
+  [%- FOREACH maintainers -%]
+	<a href="mailto:[% mail %]">[% name | html %]</a>
+  [%- END -%]
+[%- ELSE -%]
+  <h3>Maintainers:</h3>
+  [%- FOREACH maintainers -%]
+    [%- '<ul>' IF loop.first -%]
+	<li><a href="mailto:[% mail %]">[% name | html %]</a></li>
+    [%- '</ul>' IF loop.last -%]
+  [%- END -%]
+[%- END %]
+
+[% url = page.get_newest('url');
+   IF url %]
+<h3>External Resources:</h3>
+<p>Homepage: <a href="[% url | uri %]">[% url | html %]</a></p>
+[% END %]
+
+</div> <!-- end pmoreinfo -->
+[% END %]
 
 [% IF suite == "experimental" || subsection == "debian-installer" %]
 <div class="pconstantnag">
@@ -62,19 +130,27 @@ Do not install it on a normal Debian system.</p>
 </div>
 [% END %]
 
-[% UNLESS is_virtual %]
 <div id="pdesc">
-<h2>[% desc.short %]</h2>
-<p>[% desc.long %]
-</div> <!-- end pdesc -->
+[% UNLESS is_virtual %]
+	[% IF desc.short %]
+	<h2>[% desc.short %]</h2>
+	<p>[% desc.long %]
+	[% END %]
+[% ELSE %]
+	<p>This is a <em>virtual package</em>. See the <a href="[% policy_url %]">Debian policy</a> for a <a href="[% policy_url %]ch-binary.html#s-virtual_pkg">definition of virtual packages</a>.</p>
 [% END %]
+</div> <!-- end pdesc -->
 
 [% FOREACH tag IN tags %]
   [% IF loop.first -%]
     <div id="ptags"><p>
     <a href="[% tags_url %]edit.html?pkg=[% pkg | uri %]">Tags</a>:
   [%- END %]
-  [% tag %][% ', ' UNLESS loop.last %]
+  [% IF tag.1 %]
+  <a href="/about/debtags#[% string2id(tag.0) %]">[% tag.1 %]</a>[% ', ' UNLESS loop.last %]
+  [% ELSE %]
+  [% tag.0 %][% ', ' UNLESS loop.last %]
+  [% END %]
   [% IF loop.last -%]
     </p>
     </div> <!-- end ptags -->
@@ -197,45 +273,3 @@ Do not install it on a normal Debian system.</p>
   [%- END %]
 [% END %]
 
-
-[% UNLESS is_virtual %]
-<div id="pmoreinfo">
-<h2>More Information on [% pkg %]</h2><p>
-Check for <a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg | uri %]">Bug Reports</a> about [% pkg %].<br>
-[% IF src %]
-  Source Package: <a href="[% src.url %]">[% src.pkg %]</a>, Download:
-  [% FOREACH src.downloads %]
-  <a href="[% server _ path %]">[[% name %]]</a>
-  [% END %]
-  [% IF src.downloads.size == 0 %]
-  Not found
-  [% END %]
-[% END %]
-
-[% IF files %]
-<br>View the <a href="[% changelogs_url _ files.changelog.path %]">Debian changelog</a><br>
-View the <a href="[% changelogs_url _ files.copyright.path %]">copyright file</a></p>
-[% END %]
-<p>
-[% IF maintainers.size == 1 -%]
-  [%- FOREACH maintainers -%]
-    <a href="mailto:[% mail %]">[% name | html %]</a> is responsible for this Debian package.
-  [%- END -%]
-[%- ELSE -%]
-  [%- FOREACH maintainers -%]
-    [%- IF loop.first -%]
-<a href="mailto:[% mail %]">[% name | html %]</a>
-    [%- ELSIF loop.last -%]
- and <a href="mailto:[% mail %]">[% name | html %]</a> are responsible for this Debian package.
-    [%- ELSE -%]
-, <a href="mailto:[% mail %]">[% name | html %]</a>
-    [%- END -%]
-  [%- END -%]
-[%- END %]
-[% IF src -%]
-See the <a href="[% pts_url _ src.pkg | uri %]">developer information for [% pkg %]</a>.
-[%- END %]
-</p>
-<p>Search for <a href="[% (is_source ? src_search_url : search_url) _ pkg | uri %]">other versions of [% pkg %]</a></p>
-</div> <!-- end pmoreinfo -->
-[% END %]