fix footer position in generated html files

diff --git a/ChangeLog b/ChangeLog
index 7e88403c7bd3be50b8e119646dcf51d42b605fec..c26f44a258670181bc4f6c1b3f9242d6da89b7b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-18  Heikki Junes  <hjunes@cc.hut.fi>
+
+       * stepmake/bin/add-html-footer.py: fix footer position in
+       generated html files: before </body> and </html> tags.
+
 2006-04-18  Heikki Junes  <hjunes@cc.hut.fi>
 
        * scripts/GNUmakefile: revert last "fix", which rather broke make.

diff --git a/THANKS b/THANKS
index 932175aa31d7e2e32eb03c55ad35b0fc71c098cb..9ea568b509030d5def5c34e6d1fc79f04f81e62e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -15,6 +15,7 @@ CONTRIBUTORS
 
 Erlend Aasland
 David Feuer
+Heikki Junes
 Joe Neeman
 
 

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index ed45c0aaf01a5518cb24ea4ea6334eccd9406625..3304b3514a0dc8ba007d4fa520cfeecedbc35f48 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -58,8 +58,6 @@ This page is for %(package_name)s-%(package_version)s (%(branch_str)s). <br>
 Report errors to <a href="%(mail_address_url)s">%(mail_address)s</a>.</font></address>
 </p>
 </div>
-
-
 """
 
 
@@ -223,14 +221,12 @@ def do_file (f):
                        s = doctype + s
 
        if re.search (footer_tag, s) == None:
-               s = s + footer_tag + '\n'
-
                if re.search ('(?i)</body', s):
-                       s = re.sub ('(?i)</body>', footer + '</BODY>', s, 1)
+                       s = re.sub ('(?i)</body>', footer_tag + footer + '\n' + '</BODY>', s, 1)
                elif re.search ('(?i)</html', s):               
-                       s = re.sub ('(?i)</html>', footer + '</HTML>', s, 1)
+                       s = re.sub ('(?i)</html>', footer_tag + footer + '\n' + '</HTML>', s, 1)
                else:
-                       s = s + footer
+                       s = s + footer_tag + footer + '\n'
 
                s = i18n (f, s)
 
@@ -357,8 +353,18 @@ def i18n (file_name, page):
        languages = ''
        if language_menu:
                languages = LANGUAGES_TEMPLATE % vars ()
+       else:
+               languages = LANGUAGES_TEMPLATE % vars ()
+
+       # Put language menu before '</body>' and '</html>' tags
+       if re.search ('(?i)</body', page):
+               page = re.sub ('(?i)</body>', languages + '</BODY>', page, 1)
+       elif re.search ('(?i)</html', page):            
+               page = re.sub ('(?i)</html>', languages + '</HTML>', page, 1)
+       else:
+               page = page + languages
 
-       return page + languages
+       return page
        ## end i18n
 
 for f in files: