From: Frank Lichtenheld Date: Thu, 21 Feb 2008 13:24:58 +0000 (+0100) Subject: config.tmpl: Rename homepage to project_homepage X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=694cb1687b2502b24c32f1f10b6a227fa484920e;p=deb%2Fpackages.git config.tmpl: Rename homepage to project_homepage This avoids accidentially clashing with the homepage field, like I did on the download pages. --- diff --git a/static/index.tmpl b/static/index.tmpl index 3d2a04f..4d2b38a 100644 --- a/static/index.tmpl +++ b/static/index.tmpl @@ -17,7 +17,7 @@ -%]

This site provides you with information about all the packages -available in the [% organisation %] +available in the [% organisation %] Package archive.

Please contact [% admin.name %] diff --git a/templates/config.tmpl b/templates/config.tmpl index 294d8f0..e4ccf72 100644 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@ -4,7 +4,7 @@ ddtp_lang = 'en' organisation = 'Debian' - homepage = 'http://www.debian.org/' + project_homepage = 'http://www.debian.org/' packages_homepage = 'http://packages.debian.net/' searchformurl = packages_homepage search_url = '/' @@ -19,9 +19,9 @@ security_suite_suffix = '/updates' changelogs_url = 'http://packages.debian.org/changelogs/' policy_url = 'http://www.debian.org/doc/debian-policy/' - cn_help_url = homepage _ 'intro/cn' + cn_help_url = project_homepage _ 'intro/cn' logo = { - url => homepage, + url => project_homepage, src => '/Pics/openlogo-nd-25.png', alt => organisation, } @@ -31,16 +31,16 @@ years => '1997 - ' _ timestamp.year, } license = { - url => homepage _ 'license' + url => project_homepage _ 'license' } trademark = { name => copyright.name, - url => homepage _ 'trademark' + url => project_homepage _ 'trademark' } contact = { name => g('Debian Web Mailinglist'), mail => 'debian-www@lists.debian.org', - url => homepage _ 'contact', + url => project_homepage _ 'contact', } admin = { name => g('%s Webmaster', organisation), diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl index ed94954..a6705db 100644 --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@ -24,7 +24,7 @@ Total page evaluation took [% benchmark %]
[% END %]


-

0 %]>[% g('Back to:') %] [% g('%s Homepage', organisation) %] || [% g('Packages search page') %]

+

0 %]>[% g('Back to:') %] [% g('%s Homepage', organisation) %] || [% g('Packages search page') %]


diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl index 866641c..9aed6a2 100644 --- a/templates/html/head.tmpl +++ b/templates/html/head.tmpl @@ -61,7 +61,7 @@

[% g('skip the navigation') %]

- >> [% organisation %] + >> [% organisation %] >> [% g('Packages') %] [% FOREACH n IN navigation %] >> [% IF n.url %][% n.name %][% ELSE %][% n.name %][% END %]