From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 5 Aug 2008 21:09:28 +0000 (-0300)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=90b972730bae671e726706892b471e0ce0ac097a

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 <a href="%s">trademark</a> 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
  <!--/UdmComment-->
  [% END %]
  
- <hr class="hidecss">
- <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">
+ <div id="impressum">
  <p>[% g('To report a problem with the web site, e-mail <a href="mailto:%s">%s</a>. For other contact information, see the %s <a href="%s">contact page</a>.',
  	contact.mail, contact.mail, organisation, contact.url) %]</p>
- <p>[% IF timestamp.string; g('Generated:') _ ' ' _ timestamp.string _ '<br>'; END %]
- [% UNLESS footer.doNotDisplayCopyright;
- 	g('Content Copyright &copy; %s <a href="%s">%s</a>; See <a href="%s">license terms</a>.',
+ [% UNLESS footer.doNotDisplayCopyright %]
+ <p>
+ [%	g('Content Copyright &copy; %s <a href="%s">%s</a>; See <a href="%s">license terms</a>.',
  		copyright.years, copyright.url, copyright.name, license.url);
- 	' ' _ trademarknotes IF trademarknotes;
- END %]
- <p><a href="/about/">[% g('Learn more about this site') %]</a>.</p>
+ 	' ' _ trademarknotes IF trademarknotes %]
+  <a href="/about/">[% g('Learn more about this site') %]</a>.</p>
+ [% END %]
+ </div> <!-- end impressum -->
+ [% IF sponsor.name %]
+ <div id="sponsorfooter"><p>
+ [% g('Hosting provided by <a href="%s">%s</a>.', sponsor.url, sponsor.name) %]
+ </p></div>
+ [% END %]
  </div> <!-- end fineprint -->
  </div> <!-- end footer -->
 -</div> <!-- end outer -->
 +</div> <!-- end pageWrapper -->
  </body>
  </html>