From 28e9066f2f5269c65a6936bebc3ba1e8cc0cfb2f Mon Sep 17 00:00:00 2001 From: Valerie R Young Date: Tue, 26 Jul 2016 18:44:20 -0400 Subject: reproducible debian: breakout package page navigation into seperate template Decoupling the mainbody and left navigation for package pages allows us to dry up some of the logic and css between package pages and all other pages that have a left navigation. Signed-off-by: Holger Levsen --- bin/reproducible_html_packages.py | 14 +++++-- .../reproducible/basic_page.mustache | 4 +- .../reproducible/package_navigation.mustache | 44 +++++++++++++++++++++ .../reproducible/package_page.mustache | 46 ---------------------- userContent/reproducible/static/style.css | 1 - 5 files changed, 56 insertions(+), 53 deletions(-) create mode 100644 mustache-templates/reproducible/package_navigation.mustache diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py index e7a9d989..b058827f 100755 --- a/bin/reproducible_html_packages.py +++ b/bin/reproducible_html_packages.py @@ -18,6 +18,8 @@ apt_pkg.init_system() renderer = pystache.Renderer(); package_page_template = renderer.load_template( os.path.join(TEMPLATE_PATH, 'package_page')) +package_navigation_template = renderer.load_template( + os.path.join(TEMPLATE_PATH, 'package_navigation')) suitearch_section_template = renderer.load_template( os.path.join(TEMPLATE_PATH, 'package_suitearch_section')) suitearch_details_template = renderer.load_template( @@ -296,7 +298,7 @@ def gen_packages_html(packages, no_clean=False): history = '{}/{}.html'.format(HISTORY_URI, pkg) project_links = renderer.render(project_links_template) - html = renderer.render(package_page_template, { + navigation_html = renderer.render(package_navigation_template, { 'package': pkg, 'suite': suite, 'arch': arch, @@ -306,18 +308,22 @@ def gen_packages_html(packages, no_clean=False): 'notify_maintainer': package.notify_maint, 'suitearch_section_html': suitearch_section_html, 'project_links_html': project_links, - 'default_view': default_view, 'reproducible': reproducible, 'dashboard_url': DEBIAN_URL, }) + body_html = renderer.render(package_page_template, { + 'default_view': default_view, + }) + destfile = RB_PKG_PATH + '/' + suite + '/' + arch + '/' + \ pkg + '.html' desturl = REPRODUCIBLE_URL + RB_PKG_URI + '/' + suite + \ '/' + arch + '/' + pkg + '.html' title = pkg + ' - reproducible builds result' - write_html_page(title=title, body=html, destfile=destfile, - no_header=True, noendpage=True) + write_html_page(title=title, body=body_html, destfile=destfile, + no_header=True, noendpage=True, + left_nav_html=navigation_html) log.debug("Package page generated at " + desturl) if not no_clean: purge_old_pages() # housekeep is always good diff --git a/mustache-templates/reproducible/basic_page.mustache b/mustache-templates/reproducible/basic_page.mustache index f5fe0383..5ba1f8db 100644 --- a/mustache-templates/reproducible/basic_page.mustache +++ b/mustache-templates/reproducible/basic_page.mustache @@ -16,11 +16,11 @@ {{{navigation_html}}} {{/navigation_html}} - {{#navigation_html}}
{{/navigation_html}} +
{{#main_header}}

{{main_header}}

{{/main_header}} {{{main_html}}} - {{#navigation_html}}
{{/navigation_html}} +
diff --git a/mustache-templates/reproducible/package_navigation.mustache b/mustache-templates/reproducible/package_navigation.mustache new file mode 100644 index 00000000..0d579b7d --- /dev/null +++ b/mustache-templates/reproducible/package_navigation.mustache @@ -0,0 +1,44 @@ +

{{package}}

+ + +{{{project_links_html}}} diff --git a/mustache-templates/reproducible/package_page.mustache b/mustache-templates/reproducible/package_page.mustache index 9a78300a..38ca65f8 100644 --- a/mustache-templates/reproducible/package_page.mustache +++ b/mustache-templates/reproducible/package_page.mustache @@ -1,49 +1,3 @@ -
-

{{package}}

- - -{{{project_links_html}}} -