reproducible debian: decouple navigation and page writing logic

Decoupling the navigation and page writing logic made it easier to
do the following:
- fix a bug introduced by adding headers at the top of the mainbody div
  (fixed in this commit)
- make package pages to use the same structure as all other pages that
  contain a left navigation (to do in future)

Signed-off-by: Holger Levsen <holger@layer-acht.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py
index 59f4b1e2..f10c2151 100755
--- a/bin/reproducible_html_live_status.py
+++ b/bin/reproducible_html_live_status.py
@@ -52,7 +52,10 @@ def generate_schedule(arch):
     html += '</table></p>\n'
     destfile = DEBIAN_BASE + '/index_' + arch + '_scheduled.html'
     desturl = DEBIAN_URL + '/index_' + arch + '_scheduled.html'
-    write_html_page(title=title, body=html, destfile=destfile, arch=arch, style_note=True, refresh_every=60, displayed_page='scheduled')
+    left_nav_html = create_main_navigation(arch=arch,
+                                           displayed_page='scheduled')
+    write_html_page(title=title, body=html, destfile=destfile, style_note=True,
+                    refresh_every=60, left_nav_html=left_nav_html)
     log.info("Page generated at " + desturl)
 
 
@@ -122,7 +125,9 @@ def generate_oldies(arch):
         html += '</table></p>\n'
     destfile = DEBIAN_BASE + '/index_' + arch + '_oldies.html'
     desturl = DEBIAN_URL + '/index_' + arch + '_oldies.html'
-    write_html_page(title=title, body=html, destfile=destfile, arch=arch, style_note=True, refresh_every=60)
+    left_nav_html = create_main_navigation(arch=arch)
+    write_html_page(title=title, body=html, destfile=destfile, style_note=True,
+                    refresh_every=60, left_nav_html=left_nav_html)
     log.info("Page generated at " + desturl)
 
 if __name__ == '__main__':