Add links for non-default sections, repositories etc

Closes: #440641
Signed-off-by: Simon Paillard <simon.paillard@resel.enst-bretagne.fr>

diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl
index 36ae346ca253e0f26ac4936c79ec05390a0b2a0a..c563e6e3386ee8971711ce1d5eb98727c7c46327 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -16,4 +16,10 @@
                 'non-free' => g('packages that do not meet the Debian Free Software Guidelines'),
         }
 
+   section_urls = {
+                main => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-main',
+                contrib => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-contrib',
+                'non-free' => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-non-free',
+        }
+
 %]

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 7c852e9afd1c128c51de1fa5e7ea6127693ba2ea..92c0e2dae977f20733376cacacec45fc3027f7d3 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -11,6 +11,7 @@
  
 mirrors = {
        us => {
+               url => 'http://www.debian.org/',
                mirror_list => 'http://www.debian.org/mirror/list',
                north_america => [
                        "ftp.us.debian.org/debian",
@@ -89,6 +90,7 @@ mirrors = {
        },
 
        volatile => {
+               url => 'http://www.debian.org/volatile/',
                title => g('volatile packages that need major changes during the life of a stable release'),
                mirror_list => 'http://www.debian.org/volatile/volatile-mirrors',
                europa => [
@@ -129,6 +131,7 @@ mirrors = {
        },
 
        backports => {
+               url => 'http://www.backports.org/',
                title => g('newer packages that have been adapted to stable releases of Debian'),
                mirror_list => 'http://www.backports.org/debian/README.mirrors.html',
                europa => [
@@ -157,6 +160,7 @@ mirrors = {
        },
 
        debports => {
+               url => 'http://www.debian-ports.org/',
                title => g('ports of packages to architectures not yet or not anymore available in Debian'),
                mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
                unofficial_port => {

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 4503526eced2bfe981ce1d8620e1b7380f507bab..683d8bc0435673a6dda87ca2ae0cfaf701f18eb7 100644 (file)
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -123,9 +123,9 @@
     <li class="[% suite %]"><a class="resultlink" href="[% make_url(pkg,'','suite',suite,'arch','','section','') %]">[% suite %]
        [%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %]</a>[% ' (' _ s.subsection _ ')' IF s.subsection %]:
        [% PROCESS desc_i18n trans_desc=s.trans_desc desc=s.desc %]
-       [%- PROCESS marker text=section title=section_titles.$section IF section && section != main_section %]
+       [%- PROCESS marker text=section title=section_titles.$section url=section_urls.$section IF section && section != main_section %]
     [% FOREACH s.versions %]
-      <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker" title="[% mirrors.$archive.title %]">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
+      <br>[% version %] [%- IF archive != main_archive %] [[% IF mirrors.$archive.url %]<a href="[% mirrors.$archive.url %]">[% END %]<strong class="pmarker" title="[% mirrors.$archive.title %]">[% archive %]</strong>[% IF mirrors.$archive.url %]</a>[% END %]][% END %]: [% architectures.join(' ') %]
     [% END %]
     [% IF s.providers %]
        <br>[% IF s.versions.size > 0; g('also provided by:'); ELSE; g('provided by:'); END %]
@@ -143,7 +143,7 @@
      [% origin = (archive == main_archive) ? suite : "$suite/$archive";
        js_id = string2id("$pkg$suite$archive")  %]
     <li><a class="resultlink" href="[% make_url(pkg,'','source','source','suite',origin,'section','','arch','') %]">[% origin %]</a> ([% subsection %]): [% version %]
-      [%- PROCESS marker text=section title=section_titles.$section IF section %] [%- PROCESS marker text=real_archive title=mirrors.$real_archive.title IF real_archive %]
+      [%- PROCESS marker text=section title=section_titles.$section url=section_urls.$section IF section %] [%- PROCESS marker text=real_archive title=mirrors.$real_archive.title url=mirrors.$real_archive.url IF real_archive %]
     <br>[% g('Binary packages:') %] <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries.sort %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive,'arch','','archive','') %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
        [% IF binaries.size > 10 %]
        <script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('show %u binary packages', binaries.size) %]","[% g('hide %u binary packages', binaries.size) %]")</script>

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 37ea4bf1efd2482a9bdd7de3493347b56009a104..ec71a19cf074c22983515dfd5319d0c4e77b2a5e 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -56,9 +56,9 @@
 [% ELSE %]
 <h1>[% g('Package: %s (%s)', pkg, versions.short) %]
 [% END %]
-[%- PROCESS marker text=archive title=mirrors.$archive.title IF archive && archive != main_archive %]
-[%- PROCESS marker text=section title=section_titles.$section IF section && section != main_section %]
-[%- PROCESS marker text=g('essential') title=g('package manager will refuse to remove this package by default') IF page.get_newest('essential') == 'yes' %]</h1>
+[%- PROCESS marker text=archive title=mirrors.$archive.title url=mirrors.$archive.url IF archive && archive != main_archive %]
+[%- PROCESS marker text=section title=section_titles.$section url=section_urls.$section IF section && section != main_section %]
+[%- PROCESS marker text=g('essential') title=g('package manager will refuse to remove this package by default') url='http://www.debian.org/doc/debian-policy/ch-binary.html#s3.8' IF page.get_newest('essential') == 'yes' %]</h1>
 
 [% UNLESS is_virtual %]
 <div id="pmoreinfo">

diff --git a/templates/html/util.inc b/templates/html/util.inc
index cabc6a79aeb0404c2965ba3e205d0dfd296e7d12..db298d8a84312c893bd997440008edd2d34c22ff 100644 (file)
--- a/templates/html/util.inc
+++ b/templates/html/util.inc
@@ -7,7 +7,7 @@
   [%- END -%]
    ]
 [%- END -%]
-[% BLOCK marker %] [<strong class="pmarker" [% 'title="' _ title _ '"' IF title %]>[% text %]</strong>] [%- END %]
+[% BLOCK marker %] [[% IF url %]<a href="[% url %]">[% END %]<strong class="pmarker" [% 'title="' _ title _ '"' IF title %]>[% text %]</strong>[% IF url %]</a>[% END %]] [%- END %]
 [%- BLOCK desc_i18n;
    IF trans_desc.$ddtp_lang;
       trans_desc.$ddtp_lang | html;