From 1b4dc1b3191e3623a0eeb7cacef80be1ab71d0a2 Mon Sep 17 00:00:00 2001 From: Valerie R Young Date: Mon, 25 Jul 2016 18:06:00 -0400 Subject: reproducible debian: show the "show all" button when summary tag supported The "summary" tag is presentally not supported in firefox... but will be with the release of firefox version 48 in August 2016! In the meantime, this commit hides the "see all package sets in suite/arch" button on the package set pages used to expand all the summary tags for firefox. Once Firefox 48 is released, this commit should be reverted. Signed-off-by: Holger Levsen --- bin/reproducible_common.py | 3 ++- bin/reproducible_html_pkg_sets.py | 2 +- bin/templates/basic_page.mustache | 17 ++++++++++------- bin/templates/pkgset_navigation.mustache | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index dd67f467..92813e06 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -310,7 +310,7 @@ def create_main_navigation(suite=defaultsuite, arch=defaultarch, def write_html_page(title, body, destfile, no_header=False, style_note=False, noendpage=False, refresh_every=None, displayed_page=None, - left_nav_html=None): + left_nav_html=None, include_pkgset_js=None): meta_refresh_html = '' % \ refresh_every if refresh_every is not None else '' if style_note: @@ -325,6 +325,7 @@ def write_html_page(title, body, destfile, no_header=False, style_note=False, 'main_header': title if not no_header else "", 'main_html': body, 'style_dot_css_sha1sum': REPRODUCIBLE_STYLE_SHA1, + 'include_pkgset_js': include_pkgset_js, } html = renderer.render(basic_page_template, context) diff --git a/bin/reproducible_html_pkg_sets.py b/bin/reproducible_html_pkg_sets.py index c38370af..40506278 100755 --- a/bin/reproducible_html_pkg_sets.py +++ b/bin/reproducible_html_pkg_sets.py @@ -262,7 +262,7 @@ def create_pkgset_page_and_graphs(suite, arch, stats, pkgset_name): log.info("Creating meta pkgset page for %s in %s/%s.", pkgset_name, suite, arch) write_html_page(title=title, body=html_body, destfile=destfile, - left_nav_html=left_nav_html) + left_nav_html=left_nav_html, include_pkgset_js=True) def create_pkgset_graph(png_file, suite, arch, pkgset_name): diff --git a/bin/templates/basic_page.mustache b/bin/templates/basic_page.mustache index c84f95b9..f5fe0383 100644 --- a/bin/templates/basic_page.mustache +++ b/bin/templates/basic_page.mustache @@ -5,18 +5,21 @@ {{{meta_refresh}}} + {{#include_pkgset_js}} + + {{/include_pkgset_js}} {{page_title}} - {{#navigation_html}} -
+ {{#navigation_html}} +
{{{navigation_html}}} -
- {{/navigation_html}} +
+ {{/navigation_html}} {{#navigation_html}}
{{/navigation_html}} - {{#main_header}} -

{{main_header}}

- {{/main_header}} + {{#main_header}} +

{{main_header}}

+ {{/main_header}} {{{main_html}}} {{#navigation_html}}
{{/navigation_html}} diff --git a/bin/templates/pkgset_navigation.mustache b/bin/templates/pkgset_navigation.mustache index d9759409..98bfd5ce 100644 --- a/bin/templates/pkgset_navigation.mustache +++ b/bin/templates/pkgset_navigation.mustache @@ -1,6 +1,6 @@