From 03796abe87766caf831cc5710cee50c5799cfba7 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 12 Mar 2015 20:57:44 +0100
Subject: reproducible: fix html5

---
 bin/reproducible_common.sh       | 4 +++-
 bin/reproducible_html_graphs.sh  | 9 ++++++---
 bin/reproducible_html_indexes.py | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index c2d7409c..99ba0538 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -132,7 +132,9 @@ write_page_header() {
 		write_page "<p>These pages are showing the prospects of <a href=\"https://wiki.debian.org/ReproducibleBuilds\" target=\"_blank\">reproducible builds of Debian packages</a>. The results shown were obtained from <a href=\"$JENKINS_URL/view/reproducible\">several jobs running on jenkins.debian.net</a>. Thanks to <a href=\"https://www.profitbricks.com\">Profitbricks</a> for donating the virtual machine this is running on!</p>"
 	fi
 	if [ "$1" = "dd-list" ] || [ "$1" = "stats" ] ; then
-		write_page " Join <code>#debian-reproducible</code> on OFTC or <a href="mailto:reproducible-builds@lists.alioth.debian.org">send us an email</a> to get support for making sure your packages build reproducibly too!"
+		write_page "<p>Join <code>#debian-reproducible</code> on OFTC"
+		write_page "   or <a href="mailto:reproducible-builds@lists.alioth.debian.org">send us an email</a>"
+		write_page "   to get support for making sure your packages build reproducibly too!"
 		write_page "</p>"
 	fi
 	write_page "<ul><li>Have a look at:</li>"
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index 46ed46bc..8cb64e2e 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -327,7 +327,7 @@ write_usertag_table() {
 			if [ $COUNT -eq 1 ] ; then
 				write_page "<table class=\"main\"><tr><th>Bugs per usertag on $VALUE</th><th>Open</th><th>Done</th><th>Total</th></tr>"
 			elif [ $((COUNT%2)) -eq 0 ] ; then
-				write_page "<tr><td><a href=\"https://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=${FIELD:5};users=reproducible-builds@lists.alioth.debian.org&archive=both\">${FIELD:5}</a></td><td>$VALUE</td>"
+				write_page "<tr><td><a href=\"https://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=${FIELD:5};users=reproducible-builds@lists.alioth.debian.org&amp;archive=both\">${FIELD:5}</a></td><td>$VALUE</td>"
 				TOTAL=$VALUE
 				let "TOPEN=TOPEN+VALUE"
 			else
@@ -490,7 +490,7 @@ create_main_stats_page() {
 			write_page "<a href=\"/$SUITE/$ARCH/index_pkg_sets.html#${META_PKGSET[$i]}\"><img src=\"/userContent/$SUITE/$ARCH/$THUMB\" class=\"metaoverview\" alt=\"$LABEL\"></a>"
 		done
 	done
-	write_page "</p><p>"
+	write_page "</p>"
 	# write suite table
 	write_page "<table class=\"main\"><tr><th>suite</th><th>all sources packages</th><th>reproducible packages</th><th>unreproducible packages</th><th>packages failing to build</th><th>other packages</th></tr>"
 	for SUITE in $SUITES ; do
@@ -504,6 +504,7 @@ create_main_stats_page() {
 	write_page "<tr><td>issues categorized</td><td>$ISSUES</td></tr>"
 	write_page "</table>"
 	# other graphs
+	write_page "<p>"
 	# FIXME: we don't do 2 / stats_builds_age.png yet :/ (and 6 and 0 are done already)
 	for i in 3 7 4 5 1 ; do
 		write_page " <a href=\"/userContent/${TABLE[$i]}.png\"><img src=\"/userContent/${TABLE[$i]}.png\" alt=\"${MAINLABEL[$i]}\"></a>"
@@ -512,7 +513,9 @@ create_main_stats_page() {
 			create_png_from_table $i ${TABLE[$i]}.png
 		fi
 		if [ "$i" = "3" ] ; then
+			write_page "</p>"
 			write_usertag_table
+			write_page "<p>"
 		fi
 	done
 	write_page "</p>"
@@ -521,7 +524,7 @@ create_main_stats_page() {
 	for SUITE in $SUITES ; do
 		write_page " <a href=\"/$SUITE\"><img src=\"/userContent/$SUITE/${TABLE[2]}.png\" class=\"overview\" alt=\"$SUITE builds age\"></a>"
 	done
-	write_page "</p><p>"
+	write_page "</p>"
 	# the end
 	write_page_footer
 	publish_page
diff --git a/bin/reproducible_html_indexes.py b/bin/reproducible_html_indexes.py
index da7eb6d5..966bbd64 100755
--- a/bin/reproducible_html_indexes.py
+++ b/bin/reproducible_html_indexes.py
@@ -295,7 +295,7 @@ def build_page_section(page, section, suite, arch):
         return (html, footnote)           # do not output anything on the page.
     html += build_leading_text_section(section, rows, suite, arch)
     if page == 'scheduled':
-        html += '<p><table class="body">\n' + tab + '<th>#</th><th>scheduled at</th><th>suite</th><th>architecture</th><th>source package</th></tr>\n'
+        html += '<p><table class="body">\n' + tab + '<tr><th>#</th><th>scheduled at</th><th>suite</th><th>architecture</th><th>source package</th></tr>\n'
     else:
         html += '<p>\n' + tab + '<code>\n'
     for row in rows:
-- 
cgit v1.2.3-70-g09d2