From ce00640954839d8a1f4142ff610469943833cb6e Mon Sep 17 00:00:00 2001 From: Valerie R Young Date: Wed, 22 Mar 2017 12:46:17 -0400 Subject: Revert "reproducible debian: show the "show all" button when summary tag supported" This reverts commit 1b4dc1b3191e3623a0eeb7cacef80be1ab71d0a2. Signed-off-by: Holger Levsen --- bin/reproducible_common.py | 3 +-- bin/reproducible_html_pkg_sets.py | 2 +- mustache-templates/reproducible/basic_page.mustache | 7 ++----- mustache-templates/reproducible/pkgset_navigation.mustache | 2 +- userContent/reproducible/static/pkgset.js | 9 --------- userContent/reproducible/static/style.css | 4 ---- 6 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 userContent/reproducible/static/pkgset.js diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 50ca6e93..bc8b61dd 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -331,7 +331,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, include_pkgset_js=None): + left_nav_html=None): meta_refresh_html = '' % \ refresh_every if refresh_every is not None else '' if style_note: @@ -346,7 +346,6 @@ 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 607da4ac..da2ae434 100755 --- a/bin/reproducible_html_pkg_sets.py +++ b/bin/reproducible_html_pkg_sets.py @@ -259,7 +259,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, include_pkgset_js=True) + left_nav_html=left_nav_html) def create_pkgset_graph(png_file, suite, arch, pkgset_name): diff --git a/mustache-templates/reproducible/basic_page.mustache b/mustache-templates/reproducible/basic_page.mustache index 5ba1f8db..0efc02d9 100644 --- a/mustache-templates/reproducible/basic_page.mustache +++ b/mustache-templates/reproducible/basic_page.mustache @@ -5,14 +5,11 @@ {{{meta_refresh}}} - {{#include_pkgset_js}} - - {{/include_pkgset_js}} {{page_title}} - {{#navigation_html}} -
+ {{#navigation_html}} +
{{{navigation_html}}}
{{/navigation_html}} diff --git a/mustache-templates/reproducible/pkgset_navigation.mustache b/mustache-templates/reproducible/pkgset_navigation.mustache index 8228146f..c4d99011 100644 --- a/mustache-templates/reproducible/pkgset_navigation.mustache +++ b/mustache-templates/reproducible/pkgset_navigation.mustache @@ -1,6 +1,6 @@