[Qa-jenkins-scm] [jenkins.debian.net] 01/01: Revert "reproducible debian: show the "show all" button when summary tag supported"
Holger Levsen
holger at layer-acht.org
Wed Mar 22 18:04:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit ce00640954839d8a1f4142ff610469943833cb6e
Author: Valerie R Young <spectranaut at riseup.net>
Date: Wed Mar 22 12:46:17 2017 -0400
Revert "reproducible debian: show the "show all" button when summary tag supported"
This reverts commit 1b4dc1b3191e3623a0eeb7cacef80be1ab71d0a2.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
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(-)
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 50ca6e9..bc8b61d 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 = '<meta http-equiv="refresh" content="%d"></meta>' % \
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 607da4a..da2ae43 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 5ba1f8d..0efc02d 100644
--- a/mustache-templates/reproducible/basic_page.mustache
+++ b/mustache-templates/reproducible/basic_page.mustache
@@ -5,14 +5,11 @@
<meta name="viewport" content="width=device-width" />
{{{meta_refresh}}}
<link href="/static/style.css?v={{style_dot_css_sha1sum}}" type="text/css" rel="stylesheet" />
- {{#include_pkgset_js}}
- <script type="text/JavaScript" src="/static/pkgset.js"></script>
- {{/include_pkgset_js}}
<title>{{page_title}}</title>
</head>
<body class="wrapper">
- {{#navigation_html}}
- <header class="head">
+ {{#navigation_html}}
+ <header class="head">
{{{navigation_html}}}
</header>
{{/navigation_html}}
diff --git a/mustache-templates/reproducible/pkgset_navigation.mustache b/mustache-templates/reproducible/pkgset_navigation.mustache
index 8228146..c4d9901 100644
--- a/mustache-templates/reproducible/pkgset_navigation.mustache
+++ b/mustache-templates/reproducible/pkgset_navigation.mustache
@@ -1,6 +1,6 @@
<ul>
{{#pkgset_page}}
- <li id="expand-all-pkgsets">
+ <li>
<a href="/debian/{{suite}}/{{arch}}/index_pkg_sets.html"
title="To switch suite and arch, see top left">
All tracked package sets for <b>{{suite}}/{{arch}}</b>
diff --git a/userContent/reproducible/static/pkgset.js b/userContent/reproducible/static/pkgset.js
deleted file mode 100644
index 530679a..0000000
--- a/userContent/reproducible/static/pkgset.js
+++ /dev/null
@@ -1,9 +0,0 @@
-window.onload = function () {
- var userAgent = navigator.userAgent.toLowerCase();
- var version = /firefox\/(\d+)/.exec(userAgent);
- if (!version || (version.length === 2 && version[1] > 48)) {
- // Reveal the "expand-all-pkgset" button when not in firefox (where
- // summary tags are not supported)
- document.getElementById("expand-all-pkgsets").style.display='inline';
- }
-}
diff --git a/userContent/reproducible/static/style.css b/userContent/reproducible/static/style.css
index 2c4a4b4..4977523 100644
--- a/userContent/reproducible/static/style.css
+++ b/userContent/reproducible/static/style.css
@@ -180,10 +180,6 @@ ul li {
font-weight: bold;
}
-#expand-all-pkgsets {
- display: none;
-}
-
h1 {
font-size : 250%;
padding: 0;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list