diff options
| -rwxr-xr-x | bin/reproducible_common.py | 16 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 10 | ||||
| -rw-r--r-- | bin/templates/main_navigation.mustache | 196 | ||||
| -rw-r--r-- | bin/templates/project_links.mustache | 33 | ||||
| -rw-r--r-- | userContent/reproducible/static/style.css | 20 |
5 files changed, 159 insertions, 116 deletions
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 6701db26..de60cbd3 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -258,13 +258,25 @@ def convert_into_hms_string(duration): # See bash equivelent: reproducible_common.sh's "write_page_header()" def create_main_navigation(page_title, suite, arch, displayed_page=None): + suite_list = [] + for s in SUITES: + suite_list.append({ + 's': s, + 'class': 'current' if s == suite else '' + }) + arch_list = [] + for a in ARCHS: + arch_list.append({ + 'a': a, + 'class': 'current' if a == arch else '' + }) context = { 'page_title': page_title, 'suite': suite, 'arch': arch, 'project_links_html': renderer.render(project_links_template), - 'suite_list': [{'s': s} for s in SUITES], - 'arch_list': [{'a': a} for a in ARCHS], + 'suite_list': suite_list, + 'arch_list': arch_list, 'debian_uri': DEBIAN_DASHBOARD_URI, } if suite != 'experimental': diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 06134eb9..ac5116ba 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -188,7 +188,7 @@ write_page_header() { fi # Used to highlight the link for the current page - if [ "$1" = "dashboard" ] || [ "$1" = "performance" ] || [ "$1" = "repositories" ] || [ "$1" = "variations" ] ; then + if [ "$1" = "dashboard" ] || [ "$1" = "performance" ] || [ "$1" = "repositories" ] || [ "$1" = "variations" ] || [ "$1" = "suite_arch_stats" ]; then displayed_page="\"$1\": \"true\"" else displayed_page='' @@ -198,8 +198,8 @@ write_page_header() { suite_links="\"suite_list\": [" comma=0 for i in $SUITES ; do - if [ "$1" = "suite_arch_stats" ] && [ "$i" = "$SUITE" ] ; then - class="class='active'" + if [ "$i" = "$SUITE" ] ; then + class="current" else class='' fi @@ -216,8 +216,8 @@ write_page_header() { arch_links="\"arch_list\": [" comma=0 for i in ${ARCHS} ; do - if [ "$1" = "suite_arch_stats" ] && [ "$i" = "$ARCH" ] ; then - class="class='active'" + if [ "$i" = "$ARCH" ] ; then + class="current" else class='' fi diff --git a/bin/templates/main_navigation.mustache b/bin/templates/main_navigation.mustache index 63075a39..1846a2e7 100644 --- a/bin/templates/main_navigation.mustache +++ b/bin/templates/main_navigation.mustache @@ -1,20 +1,58 @@ <a href="{{debian_uri}}"><h2>Debian Dashboard</h2></a> <ul class="menu"> - <li>{{suite}}/{{arch}}:<ul class="children"> - <li>Notes:<ul class="children"> - <li {{#notes}}class='active'{{/notes}}> - <a href="/debian/{{suite}}/{{arch}}/index_notes.html"> - packages with notes + <h4>Suite/Architecture Overviews</h4> + <li> + Tested architectures: + <ul class="children"> + <li> + {{#arch_list}} + <a class='{{class}}' + href="/debian/{{suite}}/index_suite_{{a}}_stats.html"> + {{a}} </a> + {{/arch_list}} </li> - <li {{#no_notes}}class='active'{{/no_notes}}> - <a href="/debian/{{suite}}/{{arch}}/index_no_notes.html"> - packages without notes + </ul> + </li> + <li>Tested suites: + <ul class="children"> + <li> + {{#suite_list}} + <a class='{{class}}' + href="/debian/{{s}}/index_suite_{{arch}}_stats.html"> + {{s}} </a> + {{/suite_list}} </li> - </ul></li> - <li>Package states:<ul class="children"> + </ul> + </li> + <h4>Test Result Statistics</h4> + <li {{#suite_arch_stats}}class='active'{{/suite_arch_stats}}> + Results for + <a href="/debian/{{suite}}/index_suite_{{arch}}_stats.html" + title="Overview for {{suite}}/{{arch}}"> + <b>{{suite}}/{{arch}}</b> + </a> + <ul class="children"> <li> + Unreproducible packages: + <ul class="children"> + <li {{#notes}}class='active'{{/notes}}> + <a href="/debian/{{suite}}/{{arch}}/index_notes.html" + title="Show all packages with known issues or notes"> + with notes + </a> + </li> + <li {{#no_notes}}class='active'{{/no_notes}}> + <a href="/debian/{{suite}}/{{arch}}/index_no_notes.html" + title="Show all packages that have not been investigated"> + without notes + </a> + </li> + </ul> + </li> + <li>Other package states:<ul class="children"> + <li> <a href="/debian/{{suite}}/{{arch}}/index_reproducible.html" target="_parent" title="reproducible"> <img src="/static/weather-clear.png" alt="reproducible icon" /> @@ -43,83 +81,73 @@ title="blacklisted"> <img src="/static/error.png" alt="blacklisted icon" /> </a> - </li> - </ul></li> - {{#include_pkgset_link}} - <li {{#pkg_set}}class='active'{{/pkg_set}}> - <a href="/debian/{{suite}}/{{arch}}/index_pkg_sets.html"> - package sets - </a> - </li> - {{/include_pkgset_link}} - <li>Recently tested:<ul class="children"> - <li {{#last_24h}}class='active'{{/last_24h}}> - <a href="/debian/{{suite}}/{{arch}}/index_last_24h.html"> - packages tested in the last 24h - </a> - </li> - <li {{#last_48h}}class='active'{{/last_48h}}> - <a href="/debian/{{suite}}/{{arch}}/index_last_48h.html"> - packages tested in the last 48h - </a> - </li> - </ul></li> - <li {{#all_abc}}class='active'{{/all_abc}}> - <a href="/debian/{{suite}}/{{arch}}/index_all_abc.html"> - all tested packages (sorted alphabetically) - </a> - </li> - </ul></li> - <li>Architectures:<ul class="children"> - <li> - {{#arch_list}} - <a {{{class}}} href="/debian/{{suite}}/index_suite_{{a}}_stats.html"> - {{a}} - </a> - {{/arch_list}} - </li> - <li {{#scheduled}}class='active'{{/scheduled}}> - <a href="/debian/index_{{arch}}_scheduled.html">currently scheduled</a> - </li> - </ul></li> - <li>Suites:<ul class="children"> - <li> - {{#suite_list}} - <a {{{class}}} href="/debian/{{s}}/index_suite_{{arch}}_stats.html"> - {{s}} - </a> - {{/suite_list}} - </li> - <li {{#dd_list}}class='active'{{/dd_list}}> - <a href="/debian/{{suite}}/index_dd-list.html"> - maintainers of unreproducible packages - </a> - </li> - </ul></li> - <li><a {{#dashboard}}class='active'{{/dashboard}} href="{{debian_uri}}">Debian dashboard</a> - <ul class="children"> - <li {{#issues}}class='active'{{/issues}}> - <a href="/debian/index_issues.html">issues</a> - </li> - <li {{#repositories}}class='active'{{/repositories}}> - <a href="/debian/index_repositories.html"> - repositories overview - </a> </li> - <li {{#notify}}class='active'{{/notify}}> - <a href="/debian/index_notify.html" title="notify icon"> - ⚑ packages with enabled notifications + </ul></li> + {{#include_pkgset_link}} + <li {{#pkg_set}}class='active'{{/pkg_set}}> + <a href="/debian/{{suite}}/{{arch}}/index_pkg_sets.html" + title="Show stats for tracked sets of packages"> + package sets </a> </li> - <li {{#performance}}class='active'{{/performance}}> - <a href="/debian/index_performance.html">performance stats</a> - </li> - <li {{#variations}}class='active'{{/variations}}> - <a href="/debian/index_variations.html">variations tested</a> - </li> - <li {{#breakages}}class='active'{{/breakages}}> - <a href="/debian/index_breakages.html">broken pieces</a> + {{/include_pkgset_link}} + <li>Recently tested packages:<ul> + <li {{#last_24h}}class='active'{{/last_24h}}><a + href="/debian/{{suite}}/{{arch}}/index_last_24h.html" + title="Show packages tested in the last 24 hours"> + last 24h + </a></li> + <li {{#last_48h}}class='active'{{/last_48h}}><a + href="/debian/{{suite}}/{{arch}}/index_last_48h.html" + title="Show packages tested in the last 48 hours"> + last 48h + </a></li> + </ul></li> + <li {{#all_abc}}class='active'{{/all_abc}}> + <a href="/debian/{{suite}}/{{arch}}/index_all_abc.html" + title="Show all tested packages (in alphabetical order!)"> + all tested packages + </a> </li> - </ul></li> + </ul> + </li> + <li {{#scheduled}}class='active'{{/scheduled}}> + <a href="/debian/index_{{arch}}_scheduled.html" + title="Show packages currently scheduled for testing on {{arch}}"> + scheduled + </a> for {{arch}} + </li> + <li {{#dd_list}}class='active'{{/dd_list}}> + <a href="/debian/{{suite}}/index_dd-list.html" + title="Show maintainers of unreproducible packages in {{suite}}"> + maintainers of <img src="/static/weather-showers-scattered.png" + alt="Unreproducible packages"> + </a> in {{suite}} + </li> +</ul> +<ul class="menu new-menu"> + <h4>Reproducible Debian Metadata</h4> + <li {{#issues}}class='active'{{/issues}}> + <a href="/debian/index_issues.html">issues</a> + </li> + <li {{#repositories}}class='active'{{/repositories}}> + <a href="/debian/index_repositories.html"> + repositories overview + </a> + </li> + <li {{#notify}}class='active'{{/notify}}> + <a href="/debian/index_notify.html" title="notify icon"> + ⚑ packages with enabled notifications + </a> + </li> + <li {{#performance}}class='active'{{/performance}}> + <a href="/debian/index_performance.html">performance stats</a> + </li> + <li {{#variations}}class='active'{{/variations}}> + <a href="/debian/index_variations.html">variations tested</a> + </li> + <li {{#breakages}}class='active'{{/breakages}}> + <a href="/debian/index_breakages.html">broken pieces</a> + </li> </ul> {{{project_links_html}}} diff --git a/bin/templates/project_links.mustache b/bin/templates/project_links.mustache index 1e125921..b457982e 100644 --- a/bin/templates/project_links.mustache +++ b/bin/templates/project_links.mustache @@ -1,18 +1,17 @@ -<ul class="reproducible-links"> - <li>Reproducible Builds projects links - <ul class="children"><li> - <a href="https://Reproducible-builds.org">Reproducible-builds.org</a><br /> - Reproducible-builds.org - <a href="https://Reproducible-builds.org/docs/">HowTo</a><br /> - Reproducible Debian - <a href="https://wiki.debian.org/ReproducibleBuilds">Wiki</a><br /> - Reproducible builds <a href="https://reproducible.alioth.debian.org/blog/">weekly news</a><br /> - <a href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH specification</a><br /> - </li><li> - Reproducible <a href="https://tests.reproducible-builds.org/archlinux/">Arch Linux</a> / - <a href="https://tests.reproducible-builds.org/coreboot/">coreboot</a> / - <a href="https://tests.reproducible-builds.org/fedora/">Fedora</a> / - <a href="https://tests.reproducible-builds.org/freebsd/">FreeBSD</a> / - <a href="https://tests.reproducible-builds.org/netbsd/">NetBSD</a> / - <a href="https://tests.reproducible-builds.org/openwrt/">OpenWrt</a> - <a href="https://tests.reproducible-builds.org/lede/">LEDE</a> - </li></ul></li> +<ul class="reproducible-links new-menu children"> + <h4>Reproducible Builds Projects</h4> + <li> + <a href="https://Reproducible-builds.org">Reproducible-builds.org</a><br /> + Reproducible-builds.org - <a href="https://Reproducible-builds.org/docs/">HowTo</a><br /> + Reproducible Debian - <a href="https://wiki.debian.org/ReproducibleBuilds">Wiki</a><br /> + Reproducible builds <a href="https://reproducible.alioth.debian.org/blog/">weekly news</a><br /> + <a href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH specification</a><br /> + </li><li> + Reproducible <a href="https://tests.reproducible-builds.org/archlinux/">Arch Linux</a> / + <a href="https://tests.reproducible-builds.org/coreboot/">coreboot</a> / + <a href="https://tests.reproducible-builds.org/fedora/">Fedora</a> / + <a href="https://tests.reproducible-builds.org/freebsd/">FreeBSD</a> / + <a href="https://tests.reproducible-builds.org/netbsd/">NetBSD</a> / + <a href="https://tests.reproducible-builds.org/openwrt/">OpenWrt</a> + </li> </ul> diff --git a/userContent/reproducible/static/style.css b/userContent/reproducible/static/style.css index df093045..5637ee7d 100644 --- a/userContent/reproducible/static/style.css +++ b/userContent/reproducible/static/style.css @@ -91,10 +91,6 @@ a.package:visited, a.noted:visited { font-size: 0.9em; } -ul.menu { - margin-bottom: 1em; -} - .head li { list-style: none; display: block !important; @@ -121,10 +117,8 @@ ul.menu { } -ul.reproducible-links { - margin-top: 1em; +ul.new-menu { border-top: 1px solid #eee; - padding-top: 0.5em; } ul.reproducible-links li { @@ -144,6 +138,7 @@ header { } header.head { + padding-top: 0.5em; background: #fafafa; } @@ -174,6 +169,9 @@ ul li { background-color: #bfeaff; } +.current { + font-weight: bold; +} h1 { font-size : 250%; @@ -197,6 +195,12 @@ h3 { font-size : 110%; } +h4 { + color: #d70a53; + font-size : 90%; + margin: 0.5em; +} + table { counter-reset: rowNumber; /* used for automatic row count with CSS */ border: 1px solid #ddd; @@ -435,7 +439,7 @@ span.dangerous { color: orange; } border: none; border-right: 1px solid #eee; height: 100%; - padding-top: 0px; + padding-top: 0.5em; overflow: auto; } .mainbody { |