html/foot.tmpl: Overhaul the footer

* Make it more compact by not including so many separate paragraphs.
  IMHO readability has not suffered much.
* Remove the home page links. Since we now also have them at the top of
  page I think we can afford to loose them here.
* Add the possibility to add a sponsor statement. This will be needed
  for the Debian instance.

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 3e91e260cd513291ed95b3d9b1b75f59571991a8..98525ebc247c768350cbe924871bc599a8fc23f7 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -47,6 +47,10 @@
        mail => 'webmaster@debian.org',
    }
    trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
        mail => 'webmaster@debian.org',
    }
    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
 -%]
 [%-
    # possible values for importance: high, normal, low

diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl
index b911d789a3908b5b5408ff2e58c701b2ff7a055c..cbabd66a1b25a1d05841300ed8f942e9e3510590 100644 (file)
--- a/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@ -8,7 +8,7 @@ Total page evaluation took [% benchmark %]<br>
 [% IF langs.size > 0 %]
 <hr class="hidecss">
 <!--UdmComment-->
 [% IF langs.size > 0 %]
 <hr class="hidecss">
 <!--UdmComment-->

-<p>[% g('This page is also available in the following languages:') %]</p>
+<p>[% g('This page is also available in the following languages (How to set <a href="%s">the default document language</a>):', cn_help_url) %]</p>

 <p class="navpara">
 [% FOREACH l IN langs %]
 <a href="[% IF keyword_esc;
 <p class="navpara">
 [% FOREACH l IN langs %]
 <a href="[% IF keyword_esc;


@@ -19,24 +19,27 @@ Total page evaluation took [% benchmark %]<br>
 [%- IF l.transliteration %] ([% l.transliteration %])[% END %]</a>
 [% END %]
 </p>
 [%- IF l.transliteration %] ([% l.transliteration %])[% END %]</a>
 [% END %]
 </p>

-<p>[% g('How to set <a href="%s">the default document language</a>', cn_help_url) %]</p>

 <!--/UdmComment-->
 [% END %]
 
 <!--/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">
 <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>[% 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);
                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 fineprint -->
 </div> <!-- end footer -->
 </div> <!-- end outer -->