From: Frank Lichtenheld Date: Tue, 5 Aug 2008 21:09:28 +0000 (-0300) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=90b972730bae671e726706892b471e0ce0ac097a;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master Conflicts: templates/html/foot.tmpl --- 90b972730bae671e726706892b471e0ce0ac097a diff --cc templates/config.tmpl index 9b02b63,98525eb..d6e9bd6 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -36,18 -35,22 +36,22 @@@ } trademark = { name => copyright.name, - url => project_homepage _ 'trademark' + url => project_homepage _ 'aboutus/trademarkpolicy' } contact = { - name => g('Debian Web Mailinglist'), - mail => 'debian-www@lists.debian.org', - url => project_homepage _ 'contact', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', + url => project_homepage _ 'support', } admin = { - name => g('%s Webmaster', organisation), - mail => 'webmaster@debian.org', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', } trademarknotes = g('%s is a trademark of %s', organisation, trademark.url, trademark.name) + # sponsor = { + # url => 'http://example.invalid/', + # name => 'Example Sponsor, Inc.', + # } -%] [%- # possible values for importance: high, normal, low diff --cc templates/html/foot.tmpl index ba4e030,cbabd66..580e280 --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@@ -23,25 -22,26 +23,26 @@@ Total page evaluation took [% benchmar [% END %] -
-

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

-
+

[% g('To report a problem with the web site, e-mail %s. For other contact information, see the %s contact page.', contact.mail, contact.mail, organisation, contact.url) %]

-

[% IF timestamp.string; g('Generated:') _ ' ' _ timestamp.string _ '
'; END %] - [% UNLESS footer.doNotDisplayCopyright; - g('Content Copyright © %s %s; See license terms.', + [% UNLESS footer.doNotDisplayCopyright %] +

+ [% g('Content Copyright © %s %s; See license terms.', copyright.years, copyright.url, copyright.name, license.url); - ' ' _ trademarknotes IF trademarknotes; - END %] -

[% g('Learn more about this site') %].

+ ' ' _ trademarknotes IF trademarknotes %] + [% g('Learn more about this site') %].

+ [% END %] +
+ [% IF sponsor.name %] +

+ [% g('Hosting provided by %s.', sponsor.url, sponsor.name) %] +

+ [% END %]
- +