The following commit has been merged in the archive-master branch:
commit 447df2e0fb5d84ebe7fab28bc786a6ab86d15f44
Merge: afd01a99cf960a99b2736dedf06887a45883c49f
aa511b16180f384ce387125161e8a402bb90a6a2
Author: Gerfried Fuchs <rho...@debian.org>
Date: Tue Jan 11 08:36:12 2011 +0100
Merge branch 'archive-master' of
git+ssh://git.debian.org/git/webwml/packages into archive-master
diff --combined templates/html/homepage.tmpl
index 4befa4f,b022b88..0ea68ca
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@@ -12,7 -12,7 +12,7 @@@
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', 'amd64', 'arm', 'hppa', 'i386', 'ia64',
'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]
@@@ -42,7 -42,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') %]">
@@@ -72,7 -71,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>
@@@ -86,7 -84,6 +86,7 @@@
<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>
@@@ -120,7 -117,6 +120,7 @@@
[% 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' %]
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
