Merge branch 'master' into ubuntu-master

[deb/packages.git] / templates / html / foot.tmpl

diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl
index a6705db1634019603ddd9ac501cbf936e059fd80..ba4e030ed57ce884527de91049307afbfcd2d832 100644 (file)
--- a/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@ -1,8 +1,9 @@
 [%- IF benchmark && debug -%]
 Total page evaluation took [% benchmark %]<br>
 [%- END -%]
-</div> <!-- end inner -->
+</div></div></div>
 
+<div class=\"clear mozclear\"></div><div id=\"prefooter\">
 <div id="footer">
 
 [% IF langs.size > 0 %]
@@ -14,12 +15,14 @@ Total page evaluation took [% benchmark %]<br>
 <a href="[% IF keyword_esc;
                make_search_url('',"keywords=$keyword_esc",'lang',l.lang);
            ELSE;
-               "$page_name?lang=$l.lang";
+               make_url(page_name,"",'lang',l.lang);
            END %]" title="[% l.tooltip %]" hreflang="[% l.lang %]" lang="[% l.lang %]" rel="alternate">[% l.selfname %]
 [%- IF l.transliteration %] ([% l.transliteration %])[% END %]</a>
 [% END %]
 </p>
+[% IF cn_help_url %]
 <p>[% g('How to set <a href="%s">the default document language</a>', cn_help_url) %]</p>
+[% END %]
 <!--/UdmComment-->
 [% END %]
 
@@ -39,6 +42,6 @@ END %]
 <p><a href="/about/">[% g('Learn more about this site') %]</a>.</p>
 </div> <!-- end fineprint -->
 </div> <!-- end footer -->
-</div> <!-- end outer -->
+</div> <!-- end pageWrapper -->
 </body>
 </html>