summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-05-23 11:03:07 +0200
committerHolger Levsen <holger@layer-acht.org>2015-05-23 11:03:07 +0200
commit0a971561ed4d68947d60a85cd02b789a18667ed6 (patch)
treea094142e8c1168f2beb6770d4fb3f99f5119543b
parent7dfcc6c760d20aa1c25f6038dc2755cb5e941eea (diff)
downloadjenkins.debian.net-0a971561ed4d68947d60a85cd02b789a18667ed6.tar.xz
reproducible: improve layout of main page
-rwxr-xr-xbin/reproducible_html_graphs.sh18
-rw-r--r--userContent/reproducible/static/style.css4
2 files changed, 11 insertions, 11 deletions
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index 9d4a65a9..8be03ae5 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -538,7 +538,7 @@ create_main_stats_page() {
write_page "<a href=\"/$SUITE/$ARCH/pkg_set_${META_PKGSET[$i]}.html\"><img src=\"/userContent/$SUITE/$ARCH/$THUMB\" class=\"metaoverview\" alt=\"$LABEL\"></a>"
done
done
- write_page "</p>"
+ write_page "</p><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
@@ -572,25 +572,21 @@ create_main_stats_page() {
SEC=$(echo "$RESULT-($MIN*60)"|bc)
write_page "<tr><td>average test duration in all suites</td><td>$MIN minutes, $SEC seconds</td></tr>"
write_page "</table>"
- # other graphs
- write_page "<p>"
- # do the global stats
+ # write bugs with usertags table
+ write_usertag_table
+ write_page "</p><p style=\"clear:both;\">"
+ # do other global graphs
for i in 3 7 4 5 1 ; do
- if [ $i = "3" ] || [ $i = "1" ] ; then
+ if [ $i = "1" ] ; then
OVERVIEW=""
else
- OVERVIEW='class="overview"'
+ OVERVIEW='class="halfview"'
fi
write_page " <a href=\"/userContent/${TABLE[$i]}.png\"><img src=\"/userContent/${TABLE[$i]}.png\" $OVERVIEW alt=\"${MAINLABEL[$i]}\"></a>"
# redo pngs once a day
if [ ! -f $BASE/${TABLE[$i]}.png ] || [ ! -z $(find $BASE -maxdepth 1 -mtime +0 -name ${TABLE[$i]}.png) ] ; then
create_png_from_table $i ${TABLE[$i]}.png
fi
- if [ "$i" = "3" ] ; then
- write_page "</p>"
- write_usertag_table
- write_page "<p style=\"clear:both;\">"
- fi
done
write_page "</p>"
# write suite builds age graphs
diff --git a/userContent/reproducible/static/style.css b/userContent/reproducible/static/style.css
index 4ad5a4bd..449e0a7f 100644
--- a/userContent/reproducible/static/style.css
+++ b/userContent/reproducible/static/style.css
@@ -26,6 +26,10 @@ img {
height: auto;
}
+img.halfview {
+ max-width: 49%;
+}
+
img.overview {
max-width: 33%;
}