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 3d2a04fb23361a8ce638d52d1b932ed42ec5b606..4d2b38a744fea147157d183625afe2e8d70e6ace 100644 (file)
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -17,7 +17,7 @@
 -%]
 
 <p>This site provides you with information about all the packages
-available in the <a href="[% homepage %]">[% organisation %]</a>
+available in the <a href="[% project_homepage %]">[% organisation %]</a>
 Package archive.
 
 <p><em>Please contact <a href="mailto:[% admin.mail %]">[% admin.name %]</a>

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 294d8f0a1ee8a3b3e764facbc44473621230f23a..e4ccf7210df2a181afd7048e4d45b635413d746e 100644 (file)
--- 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 ed94954f35914fc909041b56a3069d017c1dc96a..a6705db1634019603ddd9ac501cbf936e059fd80 100644 (file)
--- a/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@ -24,7 +24,7 @@ Total page evaluation took [% benchmark %]<br>
 [% END %]
 
 <hr class="hidecss">
-<p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p>
+<p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% project_homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p>
 
 <hr class="hidecss">
 <div id="fineprint" class="bordertop">

diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl
index 866641cf4c7d40dbe088c600fdf326f98f4679d6..9aed6a27c138e6fa93118c48180cdc56bc7e847a 100644 (file)
--- a/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@ -61,7 +61,7 @@
 
 <p class="hidecss"><a href="#inner">[% g('skip the navigation') %]</a></p>
 <div id="pnavbar">
- &gt;&gt; <a href="[% homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
+ &gt;&gt; <a href="[% project_homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
  &gt;&gt; <a href="[% packages_homepage %]" title="[% g('%s Packages Homepage', organisation) %]">[% g('Packages') %]</a>
 [% FOREACH n IN navigation %]
  &gt;&gt; [% IF n.url %]<a href="[% n.url %]" [% IF n.title %]title="[% n.title %]"[% END %]>[% n.name %]</a>[% ELSE %][% n.name %][% END %]