Templates: Also display the suite's alias name in selected places

diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl
index 1eacb1600baa34d49bb5a2ea5bae290d4623d9f8..6e501c7ababaf3983d2b0c7f1cb8f3d506a1b00c 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -2,4 +2,11 @@
    main_section = 'main'
    main_archive = 'us'
    standard_priority = 'optional'
    main_section = 'main'
    main_archive = 'us'
    standard_priority = 'optional'

+
+   suite_aliases = {
+               sarge => 'oldstable', 
+               etch => 'stable',
+               lenny => 'testing',
+               sid => 'unstable',
+                  }

 %]
 %]

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 0bc23e6e4dd71144d7a5bf4cbd47c0b1b4990c07..faf582c596c1da612c2aaac922e9094b72299274 100644 (file)
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -85,8 +85,10 @@ Please consider using a longer keyword or more keywords.</p>
 [% FOREACH packages %]
   <h3>Package [% pkg %]</h3>
   <ul>
 [% FOREACH packages %]
   <h3>Package [% pkg %]</h3>
   <ul>

-  [% FOREACH s IN suites %]
-    <li class="[% s.suite %]"><a class="resultlink" href="[% make_url(pkg,'','suite',s.suite,'arch','','section','') %]">[% s.suite %]</a>[% ' (' _ s.subsection _ ')' IF s.subsection %]: [% s.desc %]  [%- IF s.section != main_section %] [<strong class="pmarker">[% s.section %]</strong>][% END %]
+  [% FOREACH s IN suites;
+       suite = s.suite %]
+    <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 %]: [% s.desc %]  [%- IF s.section != main_section %] [<strong class="pmarker">[% s.section %]</strong>][% END %]

     [% FOREACH s.versions %]
       <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
     [% END %]
     [% FOREACH s.versions %]
       <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
     [% END %]

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 2be807156bee8bb0144325822c5cf0f96491c02b..554f48fd1e8f5b706c194180b7555ab4cc11a13a 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -9,7 +9,9 @@
                [ 'hg', 'Hg', 'mercurial' ], ];
    vcs_link = page.get_newest("vcs-browser");
 -%]
                [ 'hg', 'Hg', 'mercurial' ], ];
    vcs_link = page.get_newest("vcs-browser");
 -%]

-[%- nav_arr = [ { prefix=>'Distribution:', title=>'Overview over this suite', url=>make_url('/','','source',''), name=>suite }, ];
+[%- suite_name = suite;
+    SET suite_name = suite_name _ ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite;
+    nav_arr = [ { prefix=>'Distribution:', title=>'Overview over this suite', url=>make_url('/','','source',''), name=>suite_name }, ];

     nav_arr.push( { title => 'Source packages', url=>make_url('/'), name=>'Source' } ) IF is_source;
     nav_arr.push( { prefix=>'Section:', title=>'All packages in this section', url=>make_url("$subsection/"), name=>subsection } );
     nav_arr.push( { prefix=>'Package:', name=>pkg } ); -%]
     nav_arr.push( { title => 'Source packages', url=>make_url('/'), name=>'Source' } ) IF is_source;
     nav_arr.push( { prefix=>'Section:', title=>'All packages in this section', url=>make_url("$subsection/"), name=>subsection } );
     nav_arr.push( { prefix=>'Package:', name=>pkg } ); -%]