[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible debian navigation: merge package states icons into one field

Sat May 14 00:16:03 UTC 2016

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 b094aec74e2ee067711216058ad99d01886ab5a5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 14 02:12:35 2016 +0200

    reproducible debian navigation: merge package states icons into one field
---
 bin/reproducible_common.py | 16 ++--------------
 bin/reproducible_common.sh |  7 ++++---
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 2bf0947..61a9c4c 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -169,42 +169,30 @@ html_head_page = Template((tab*2).join("""
 <header class="head">
   <h2>$page_title</h2>
   <ul class=\"menu\">
-    <li>Package states:</li>
+    <li>Package states:<ul class="children">
     <li>
       <a href="/$suite/$arch/index_reproducible.html" target="_parent">
         <img src="/static/weather-clear.png" alt="reproducible icon" />
       </a>
-    </li>
-    <li>
       <a href="/$suite/$arch/index_FTBR.html" target="_parent">
         <img src="/static/weather-showers-scattered.png" alt="FTBR icon" />
       </a>
-    </li>
-    <li>
       <a href="/$suite/$arch/index_FTBFS.html" target="_parent">
         <img src="/static/weather-storm.png" alt="FTBFS icon" />
       </a>
-    </li>
-    <li>
       <a href="/$suite/$arch/index_depwait.html" target="_parent">
         <img src="/static/weather-snow.png" alt="depwait icon" />
       </a>
-    </li>
-    <li>
       <a href="/$suite/$arch/index_not_for_us.html" target="_parent">
         <img src="/static/weather-few-clouds-night.png" alt="not_for_us icon" />
       </a>
-    </li>
-    <li>
       <a href="/$suite/$arch/index_404.html" target="_parent">
         <img src="/static/weather-severe-alert.png" alt="404 icon" />
       </a>
-    </li>
-    <li>
       <a href="/$suite/$arch/index_blacklisted.html" target="_parent">
         <img src="/static/error.png" alt="blacklisted icon" />
       </a>
-    </li>
+    </li></ul></li>
     <li><a href="/index_issues.html">issues</a></li>
     <li><a href="/$suite/$arch/index_notes.html">packages with notes</a></li>
     <li><a href="/$suite/$arch/index_no_notes.html">packages without notes</a></li>
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index b465303..d365751 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -210,13 +210,14 @@ write_page_header() {
 	else
 		write_page "<body class=\"wrapper\" onload=\"selectSearch()\"><header class=\"head\"><h2>$2</h2>"
 	fi
-	write_page "<ul class=\"menu\"><li>Package states:</li>"
+	write_page "<ul class=\"menu\"><li>Package states:"
+	write_page "<ul class=\"children\"><li>"
 	for MY_STATE in $ALLSTATES ; do
 		set_icon $MY_STATE
-		write_page "<li>"
 		write_icon
-		write_page "</li>"
+		write_page " "
 	done
+	write_page "</li></ul></li>"
 	for TARGET in $ALLVIEWS ; do
 		if [ "$TARGET" = "pkg_sets" ] && [ "$SUITE" = "experimental" ] ; then
 			# no pkg_sets are tested in experimental

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git

