From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 Feb 2013 16:07:49 +0000 (+0100)
Subject: BuildHeadline: Slink header.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3a9ee4e7fb311ebf09abc3851284eecb7ea2bae;p=pbs.git

BuildHeadline: Slink header.
---

diff --git a/data/templates/build-bugs.html b/data/templates/build-bugs.html
index eedb9c57..0b83aa6f 100644
--- a/data/templates/build-bugs.html
+++ b/data/templates/build-bugs.html
@@ -21,7 +21,7 @@
 		</li>
 	</ul>
 
-	{% module BuildHeadline(_("Bug list"), build, short=True) %}
+	{% module BuildHeadline(build, short=True) %}
 
 	<div class="row">
 		<div class="span8 offset2">
diff --git a/data/templates/build-delete.html b/data/templates/build-delete.html
index 4c36aca4..cfcbd386 100644
--- a/data/templates/build-delete.html
+++ b/data/templates/build-delete.html
@@ -25,7 +25,7 @@
 		</li>
 	</ul>
 
-	{% module BuildHeadline(_("Build"), build) %}
+	{% module BuildHeadline(build) %}
 
 	<div class="row">
 		<div class="span8">
diff --git a/data/templates/build-detail.html b/data/templates/build-detail.html
index c2bb12d9..4ab02264 100644
--- a/data/templates/build-detail.html
+++ b/data/templates/build-detail.html
@@ -21,7 +21,7 @@
 		</li>
 	</ul>
 
-	{% module BuildHeadline(_("Build"), build) %}
+	{% module BuildHeadline(build) %}
 	{% module BuildStateWarnings(build) %}
 
 	<div class="row">
diff --git a/data/templates/build-state.html b/data/templates/build-state.html
index 707fc685..6dfca600 100644
--- a/data/templates/build-state.html
+++ b/data/templates/build-state.html
@@ -3,20 +3,30 @@
 {% block title %}{{ _("Build") }}: {{ build.name }}{% end block %}
 
 {% block body %}
-	<h1>{{ _("Build") }}:
-		<a href="/package/{{ build.pkg.name }}">{{ build.pkg.name }}</a>-{{ build.pkg.friendly_version }}
-		{% if build.type == "scratch" %}
-			<span>{{ _("Scratch build") }}</span>
-		{% end %}
-
-		{% if build.distro %}
-			- <span>{{ _("Distribution") }}: {{ build.distro.name }}</span>
-		{% end %}
-	</h1>
+	<ul class="breadcrumb">
+		<li>
+			<a href="/">{{ _("Home") }}</a>
+			<span class="divider">/</span>
+		</li>
+		<li>
+			<a href="/packages">{{ _("Packages") }}</a>
+			<span class="divider">/</span>
+		</li>
+		<li>
+			<a href="/package/{{ build.pkg.name }}">{{ build.pkg.name }}</a>
+			<span class="divider">/</span>
+		</li>
+		<li>
+			<a href="/build/{{ build.uuid }}">{{ build.name }}</a>
+			<span class="divider">/</span>
+		</li>
+		<li class="active">
+			<a href="/build/{{ build.uuid }}/state">{{ _("State") }}</a>
+		</li>
+	</ul>
 
-	<div class="pkg-summary">
-		{{ build.pkg.summary }}
-	</div>
+	{% module BuildHeadline(build) %}
+	{% module BuildStateWarnings(build) %}
 
 	<table class="form form2">
 		<tr>
@@ -25,7 +35,6 @@
 			</td>
 		</tr>
 	</table>
-	<div style="clear: both;">&nbsp;</div>
 
 	<!-- XXX add some more information about what every single state means -->
 
@@ -122,11 +131,3 @@
 		</table>
 	{% end %}
 {% end block %}
-
-{% block sidebar %}
-	<h1>{{ _("Actions") }}</h1>
-	<ul>
-		<li><a href="/build/{{ build.uuid }}">{{ _("Back to build") }}</a></li>
-	</ul>
-	<div style="clear: both;">&nbsp;</div>
-{% end %}
diff --git a/data/templates/modules/build-headline.html b/data/templates/modules/build-headline.html
index 8a886ad0..21e3c5e4 100644
--- a/data/templates/modules/build-headline.html
+++ b/data/templates/modules/build-headline.html
@@ -14,10 +14,6 @@
 	</div>
 
 	<h2>
-		{% if prefix %}
-			{{ prefix }}:
-		{% end %}
-
 		{% if shorter %}
 			{{ pkg.name }}
 		{% else %}
diff --git a/data/templates/package-detail-list.html b/data/templates/package-detail-list.html
index 7f658337..ac151398 100644
--- a/data/templates/package-detail-list.html
+++ b/data/templates/package-detail-list.html
@@ -38,7 +38,7 @@
 		</ul>
 	</div>
 
-	{% module BuildHeadline(_("Package"), latest_build, shorter=True) %}
+	{% module BuildHeadline(latest_build, shorter=True) %}
 	{% module PackageHeader(pkg) %}
 
 	<hr class="clear">
diff --git a/data/templates/package-properties.html b/data/templates/package-properties.html
index 22d53db3..e7000c88 100644
--- a/data/templates/package-properties.html
+++ b/data/templates/package-properties.html
@@ -21,7 +21,7 @@
 		</li>
 	</ul>
 
-	{% module BuildHeadline(None, build, shorter=True) %}
+	{% module BuildHeadline(build, shorter=True) %}
 
 	<div class="row">
 		<div class="span8">
diff --git a/web/ui_modules.py b/web/ui_modules.py
index fba0733a..a369e7e9 100644
--- a/web/ui_modules.py
+++ b/web/ui_modules.py
@@ -92,12 +92,12 @@ class ModalModule(UIModule):
 
 
 class BuildHeadlineModule(UIModule):
-	def render(self, prefix, build, short=False, shorter=False):
+	def render(self, build, short=False, shorter=False):
 		if shorter:
 			short = True
 
 		return self.render_string("modules/build-headline.html",
-			prefix=prefix, build=build, pkg=build.pkg, short=short, shorter=shorter)
+			build=build, pkg=build.pkg, short=short, shorter=shorter)
 
 
 class JobsStatusModule(UIModule):