[oe-commits] [bitbake] 16/19: toaster: custom breadcrumb for the default project
git at git.openembedded.org
git at git.openembedded.org
Fri Feb 26 17:59:18 UTC 2016
rpurdie pushed a commit to branch master
in repository bitbake.
commit 5545acf6703a25ee46776138bbbd804615add89c
Author: Belen Barros Pena <belen.barros.pena at intel.com>
AuthorDate: Wed Feb 24 13:49:38 2016 +0000
toaster: custom breadcrumb for the default project
The default "Command line builds" project does not have a Configuration
page. It therefore needs a custom breadcrumb where the project name goes
to the project builds page, instead of the project configuration page.
Signed-off-by: Belen Barros Pena <belen.barros.pena at intel.com>
Signed-off-by: Elliot Smith <elliot.smith at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/toaster/toastergui/templates/basebuilddetailpage.html | 7 +++++--
lib/toaster/toastergui/templates/basebuildpage.html | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/toaster/toastergui/templates/basebuilddetailpage.html b/lib/toaster/toastergui/templates/basebuilddetailpage.html
index e350c1a..a62e0b1 100644
--- a/lib/toaster/toastergui/templates/basebuilddetailpage.html
+++ b/lib/toaster/toastergui/templates/basebuilddetailpage.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load project_url_tag %}
{% load humanize %}
{% block pagecontent %}
@@ -6,8 +7,10 @@
<!-- Breadcrumbs -->
<div class="section">
<ul class="breadcrumb" id="breadcrumb">
- <li><a href="{% url 'project' build.project.id %}">{{build.project.name}}</a></li>
- <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li>
+ <li><a href="{% project_url build.project %}">{{build.project.name}}</a></li>
+ {% if not build.project.is_default %}
+ <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li>
+ {% endif %}
<li><a href="{%url 'builddashboard' build.pk%}">{{build.get_sorted_target_list.0.target}} {%if build.target_set.all.count > 1%}(+{{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|date:"d/m/y H:i"}})</a></li>
{% block localbreadcrumb %}{% endblock %}
</ul>
diff --git a/lib/toaster/toastergui/templates/basebuildpage.html b/lib/toaster/toastergui/templates/basebuildpage.html
index 3571869..0dc71f5 100644
--- a/lib/toaster/toastergui/templates/basebuildpage.html
+++ b/lib/toaster/toastergui/templates/basebuildpage.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load projecttags %}
+{% load project_url_tag %}
{% load humanize %}
{% block pagecontent %}
@@ -8,8 +9,10 @@
<!-- Breadcrumbs -->
<div class="section">
<ul class="breadcrumb" id="breadcrumb">
- <li><a href="{% url 'project' build.project.id %}">{{build.project.name}}</a></li>
- <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li>
+ <li><a href="{% project_url build.project %}">{{build.project.name}}</a></li>
+ {% if not build.project.is_default %}
+ <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li>
+ {% endif %}
<li>
{% block parentbreadcrumb %}
<a href="{%url 'builddashboard' build.pk%}">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list