Merge branch 'archive-master' of git+ssh://git.debian.org/git/webwml/packages into...

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

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 90796d7acaf965c9d7e01dadd474088e30e8c16b..0ea68ca008172ccf6208a25230ebf115e1cc8e6e 100644 (file)
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -4,16 +4,17 @@
        keywords = g('Packages')
 -%]
 [%-
-    all_suites = [ 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge' ]
-    version_numbers = { sarge  => '3.1',
+    all_suites = [ 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge', 'etch' ]
+    version_numbers = { etch   => '4.0',
+                       sarge  => '3.1',
                        woody  => '3.0',
                        potato => '2.2',
                        slink  => '2.1',
                        hamm   => '2.0',
                        bo     => '1.3.1'}
-    current_release = 'sarge'
+    current_release = 'etch'
     all_sections = [ 'main', 'contrib', 'non-free' ]
-    all_architectures = [ 'alpha', 'arm', 'hppa', 'i386', 'ia64',
+    all_architectures = [ 'alpha', 'amd64', 'arm', 'hppa', 'i386', 'ia64',
                          'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]
 -%]
 
@@ -41,6 +42,7 @@
 <h3>[% g('Search package directories') %]</h3>
 
 <form method="GET" action="/search">
+<p>
 <label for="kw">[% g('Keyword:') %]</label>
 <input type="text" size="30" name="keywords" id="kw">
 <input type="submit" value="[% g('Search') %]"> <input type="reset" value="[% g('Reset') %]">
@@ -70,6 +72,7 @@ Distribution:
 [% END %]
   <option value="all" selected="selected">[% g('any') %]</option>
 </select>
+</p>
 </form>
 <p>[% g('There are shortcuts for some searches available:') %]</p>
 <ul>
@@ -83,6 +86,7 @@ Distribution:
 
 <p>[% g('This search engine allows you to search the contents of %s distributions for any files (or just parts of file names) that are part of packages. You can also get a full list of files in a given package.', organisation) %]<br>
 <form method="GET" action="/search">
+<p>
 <input type="hidden" name="searchon" value="contents">
 
 <label for="keyword">[% g('Keyword:') %]</label>
@@ -116,6 +120,7 @@ Distribution:
 [% END %]
   <option value="any" selected="selected">[% g('any') %]</option>
 </select>
+</p>
 </form>
 
-[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2009' %]
+[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2010' %]