From a7f7ecc84d803f1d3adf4e9f7babc01fe6de9199 Mon Sep 17 00:00:00 2001
From: Valerie R Young <spectranaut@riseup.net>
Date: Thu, 14 Jul 2016 12:03:24 -0400
Subject: reproducible debian: move page titles to mainbody, add dashboard
 header in nav

Signed-off-by: Holger Levsen <holger@layer-acht.org>
---
 bin/reproducible_common.py             | 4 ++--
 bin/reproducible_common.sh             | 6 ++++--
 bin/templates/basic_page.mustache      | 1 +
 bin/templates/main_navigation.mustache | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 70a4f62c..6701db26 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -29,7 +29,6 @@ from subprocess import call, check_call
 from tempfile import NamedTemporaryFile
 from datetime import datetime, timedelta
 
-
 DEBUG = False
 QUIET = False
 
@@ -79,6 +78,7 @@ BUILDINFO_PATH = BASE + BUILDINFO_URI
 
 REPRODUCIBLE_URL = 'https://tests.reproducible-builds.org'
 DEBIAN_URL = 'https://tests.reproducible-builds.org/debian'
+DEBIAN_DASHBOARD_URI = '/debian/reproducible.html'
 JENKINS_URL = 'https://jenkins.debian.net'
 
 # global package set definitions
@@ -265,7 +265,7 @@ def create_main_navigation(page_title, suite, arch, displayed_page=None):
         'project_links_html': renderer.render(project_links_template),
         'suite_list': [{'s': s} for s in SUITES],
         'arch_list': [{'a': a} for a in ARCHS],
-        'debian_url': DEBIAN_URL,
+        'debian_uri': DEBIAN_DASHBOARD_URI,
     }
     if suite != 'experimental':
         # there are not package sets in experimental
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 52488936..06134eb9 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -37,6 +37,7 @@ fi
 # common variables
 REPRODUCIBLE_URL=https://tests.reproducible-builds.org
 DEBIAN_URL=https://tests.reproducible-builds.org/debian
+DEBIAN_DASHBOARD_URI=/debian/reproducible.html
 REPRODUCIBLE_DOT_ORG_URL=https://reproducible-builds.org
 # shop trailing slash
 JENKINS_URL=${JENKINS_URL:0:-1}
@@ -234,10 +235,10 @@ write_page_header() {
 		"arch" : "%s",
 		"suite" : "%s",
 		"page_title" : "%s",
-		"debian_url" : "%s",
+		"debian_uri" : "%s",
 		%s,
 		%s
-	' "$ARCH" "$SUITE" "$2" "$DEBIAN_URL" "$arch_links" "$suite_links")
+	' "$ARCH" "$SUITE" "$2" "$DEBIAN_DASHBOARD_URI" "$arch_links" "$suite_links")
 	if [[ ! -z $displayed_page ]] ; then
 		context+=", $displayed_page"
 	fi
@@ -252,6 +253,7 @@ write_page_header() {
 	write_page "</header>"
 
 	write_page "<div class=\"mainbody\">"
+	write_page "<h2>$2</h2>"
 	if [ "$1" = "$MAINVIEW" ] ; then
 		write_page "<ul>"
 		write_page "   A general website <li><a href=\"https://reproducible-builds.org\">Reproducible-builds.org</a></li> is available now."
diff --git a/bin/templates/basic_page.mustache b/bin/templates/basic_page.mustache
index 345d2da0..97a60d06 100644
--- a/bin/templates/basic_page.mustache
+++ b/bin/templates/basic_page.mustache
@@ -12,6 +12,7 @@
       {{{main_navigation_html}}}
 	</header>
     <div class="mainbody">
+	  <h2>{{page_title}}</h2>
       {{{main_html}}}
     </div>
   </body>
diff --git a/bin/templates/main_navigation.mustache b/bin/templates/main_navigation.mustache
index ab905fd2..15e8cbdb 100644
--- a/bin/templates/main_navigation.mustache
+++ b/bin/templates/main_navigation.mustache
@@ -1,4 +1,4 @@
-<h2>{{page_title}}</h2>
+<a href="{{debian_uri}}"><h2>Debian Dashboard</h2></a>
 <ul class="menu">
   <li>{{suite}}/{{arch}}:<ul class="children">
     <li>Notes:<ul class="children">
@@ -89,7 +89,7 @@
       </a>
     </li>
   </ul></li>
-  <li><a {{#dashboard}}class='active'{{/dashboard}} href="{{debian_url}}">Debian dashboard</a>
+  <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>
-- 
cgit v1.2.3-70-g09d2