Hi,

I think the current suite/arch list is a bit unintuitive since it is not
clear which suite/arch are built and which is currently shown.

See attached patches for a proposal to make it a bit nicer.

HW42
From be75eced896ff097ac68f510fd98be93aa5f8725 Mon Sep 17 00:00:00 2001
From: HW42 <h...@ipsumj.de>
Date: Sun, 30 Aug 2015 02:12:10 +0200
Subject: [PATCH 1/3] package html: remove unneeded <span> in suite list

This makes formating of the <li>s easier. In additions this fix the
wrongly orderder </li></span>
---
 bin/reproducible_html_packages.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index b44128b..b2073de 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -182,7 +182,8 @@ def gen_suites_links(package, current_suite, current_arch):
             if not status:  # The package is not available in that suite/arch
                 continue
             version = package.get_tested_version(s, a)
-            html += '<li><span class="suite">\n' + tab
+            li_classes = ['suite']
+            html += '<li class="' + ' '.join(li_classes) + '">\n' + tab
             if status != 'untested':
                 prefix = '<a href="/{}/{}/index_{}.html">'.format(s, a, status)
                 suffix = '</a>\n'
@@ -192,9 +193,9 @@ def gen_suites_links(package, current_suite, current_arch):
             icon = prefix + '<img src="/static/{icon}" alt="{status}" title="{status}"/>' + suffix
             html += icon.format(icon=join_status_icon(status)[1], status=status)
             html += (tab*2 + ' <a href="{}/{}/{}/{}.html" target="_parent"' + \
-                     ' title="{}: {}">{}</a>: {}</li>\n').format(RB_PKG_URI,
+                     ' title="{}: {}">{}</a>: {}\n').format(RB_PKG_URI,
                      s, a, package.name, status, version, s, version)
-            html += '</span>\n'
+            html += '</li>\n'
         html += tab + '</ul></li>'
     html += '</ul>\n'
     return tab*5 + (tab*7).join(html.splitlines(True))
-- 
2.5.0

From afc8f0ddcfd0da67c943e60de6b63b88a0a3ff95 Mon Sep 17 00:00:00 2001
From: HW42 <h...@ipsumj.de>
Date: Sun, 30 Aug 2015 02:17:36 +0200
Subject: [PATCH 2/3] package html: make it more clear which suite is currently
 shown

---
 bin/reproducible_html_packages.py         | 6 +++---
 userContent/reproducible/static/style.css | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index b2073de..da63a87 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -174,8 +174,6 @@ def gen_suites_links(package, current_suite, current_arch):
         html += tab + '<li>{}\n'.format(a)
         html += tab + '<ul class="children">\n'
         for s in SUITES:
-            if s == current_suite and a == current_arch:
-                continue
             if a == 'armhf' and s != 'unstable':
                 continue
             status = package.get_status(s, a)
@@ -183,8 +181,10 @@ def gen_suites_links(package, current_suite, current_arch):
                 continue
             version = package.get_tested_version(s, a)
             li_classes = ['suite']
+            if s == current_suite and a == current_arch:
+                li_classes.append('active')
             html += '<li class="' + ' '.join(li_classes) + '">\n' + tab
-            if status != 'untested':
+            if s != current_suite or a != current_arch or status != 'untested':
                 prefix = '<a href="/{}/{}/index_{}.html">'.format(s, a, status)
                 suffix = '</a>\n'
             else:
diff --git a/userContent/reproducible/static/style.css b/userContent/reproducible/static/style.css
index d4708b7..dfeaa07 100644
--- a/userContent/reproducible/static/style.css
+++ b/userContent/reproducible/static/style.css
@@ -104,6 +104,10 @@ ul.menu {
 	clear: left;
 }
 
+.suite.active {
+	background-color: #bfeaff;
+}
+
 ul.reproducible-links {
 	margin-top: 1em;
 	border-top: 1px solid #eee;
-- 
2.5.0

From 4c4f0be247b443bd1e6d5f2315ffa223e71341a9 Mon Sep 17 00:00:00 2001
From: HW42 <h...@ipsumj.de>
Date: Sun, 30 Aug 2015 02:19:03 +0200
Subject: [PATCH 3/3] package html: add a bit spacing between <li>s

---
 userContent/reproducible/static/style.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/userContent/reproducible/static/style.css b/userContent/reproducible/static/style.css
index dfeaa07..f4831b4 100644
--- a/userContent/reproducible/static/style.css
+++ b/userContent/reproducible/static/style.css
@@ -96,7 +96,10 @@ ul.menu {
 }
 
 .head ul.children li {
-	margin: 0;
+	margin-top: 0.75ex;
+	margin-bottom: 0;
+	margin-left: 0;
+	margin-right: 0;
 }
 
 .suite {
-- 
2.5.0

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
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