Hi,

Attached is the following:

  commit 84c553778481026734785eddfe3011cc0f5201e4
  Author: Chris Lamb <la...@debian.org>
  Date:   Thu Aug 11 20:48:02 2016 +0100
  
      reproducible Debian: Ensure that we can always get back to "home" of this 
package
      
      I forget what it's called in "Don't Make Me Think" but I keep trying to
      click this to get back to the "homepage" for this suite/arch/pkg combo.
      
      Signed-off-by: Chris Lamb <la...@debian.org>
  
   bin/reproducible_html_packages.py                           | 5 +++--
   mustache-templates/reproducible/package_navigation.mustache | 2 +-
   userContent/reproducible/static/style.css                   | 4 ++++
   3 files changed, 8 insertions(+), 3 deletions(-)
  
  commit 8925a069f7c3ff7b563088df5839f2753a35b22a
  Author: Chris Lamb <la...@debian.org>
  Date:   Thu Aug 11 20:48:12 2016 +0100
  
      reproducible Debian: Prefer .format over concatentation.
  
   bin/reproducible_html_packages.py | 9 +++++++--
   1 file changed, 7 insertions(+), 2 deletions(-)


You can also merge from the "ensure-we-can-always-get-home-for-package" branch 
of
https://github.com/lamby/jenkins.debian.net if that is more convenient.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-
From 84c553778481026734785eddfe3011cc0f5201e4 Mon Sep 17 00:00:00 2001
From: Chris Lamb <la...@debian.org>
Date: Thu, 11 Aug 2016 20:48:02 +0100
Subject: [PATCH 1/2] reproducible Debian: Ensure that we can always get back
 to "home" of this package

I forget what it's called in "Don't Make Me Think" but I keep trying to
click this to get back to the "homepage" for this suite/arch/pkg combo.

Signed-off-by: Chris Lamb <la...@debian.org>
---
 bin/reproducible_html_packages.py                           | 5 +++--
 mustache-templates/reproducible/package_navigation.mustache | 2 +-
 userContent/reproducible/static/style.css                   | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index 765826a..1c0f6d9 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -362,6 +362,8 @@ def gen_packages_html(packages, no_clean=False):
                         'history_arch_uri': '{}/{}/{}.html'.format(HISTORY_URI, a, pkg)
                     })
                 project_links = renderer.render(project_links_template)
+                desturl = REPRODUCIBLE_URL + RB_PKG_URI + '/' + suite + \
+                          '/' + arch + '/' + pkg + '.html'
 
                 navigation_html = renderer.render(package_navigation_template, {
                     'package': pkg,
@@ -376,6 +378,7 @@ def gen_packages_html(packages, no_clean=False):
                     'project_links_html': project_links,
                     'reproducible': reproducible,
                     'dashboard_url': DEBIAN_URL,
+                    'desturl': desturl,
                 })
 
                 body_html = renderer.render(package_page_template, {
@@ -383,8 +386,6 @@ def gen_packages_html(packages, no_clean=False):
                 })
 
                 destfile = os.path.join(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=body_html, destfile=destfile,
                                 no_header=True, noendpage=True,
diff --git a/mustache-templates/reproducible/package_navigation.mustache b/mustache-templates/reproducible/package_navigation.mustache
index 26c0228..3bea56c 100644
--- a/mustache-templates/reproducible/package_navigation.mustache
+++ b/mustache-templates/reproducible/package_navigation.mustache
@@ -1,4 +1,4 @@
-<h2 class="package-name">{{package}}</h2>
+<h2 class="package-name"><a href="{{uri}}">{{package}}</a></h2>
 <ul class="menu">
   <h4>Test Details
     <a href="/debian/index_notify.html" target="_parent">
diff --git a/userContent/reproducible/static/style.css b/userContent/reproducible/static/style.css
index 0ef764e..5ac16f7 100644
--- a/userContent/reproducible/static/style.css
+++ b/userContent/reproducible/static/style.css
@@ -145,6 +145,10 @@ header.head {
 	background: #fafafa;
 }
 
+header.head h2.package-name a {
+	color: #fff;
+}
+
 footer {
 	text-align: center;
 	margin-top: 1em;
-- 
2.8.1

From 8925a069f7c3ff7b563088df5839f2753a35b22a Mon Sep 17 00:00:00 2001
From: Chris Lamb <la...@debian.org>
Date: Thu, 11 Aug 2016 20:48:12 +0100
Subject: [PATCH 2/2] reproducible Debian: Prefer .format over concatentation.

---
 bin/reproducible_html_packages.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index 1c0f6d9..250cec0 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -362,8 +362,13 @@ def gen_packages_html(packages, no_clean=False):
                         'history_arch_uri': '{}/{}/{}.html'.format(HISTORY_URI, a, pkg)
                     })
                 project_links = renderer.render(project_links_template)
-                desturl = REPRODUCIBLE_URL + RB_PKG_URI + '/' + suite + \
-                          '/' + arch + '/' + pkg + '.html'
+                desturl = '{}{}/{}/{}/{}.html'.format(
+                    REPRODUCIBLE_URL,
+                    RB_PKG_URI,
+                    suite,
+                    arch,
+                    pkg,
+                )
 
                 navigation_html = renderer.render(package_navigation_template, {
                     'package': pkg,
-- 
2.8.1

_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Reply via email to