summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2014-03-24 19:50:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-28 13:44:51 +0000
commit056fbc47c76f5ff238fb01302f0dce457dabc08d (patch)
treefba1b27c46050583b0d676bc9903a64c4c0bcda9 /bitbake/lib/toaster
parent405e190b314db29e1332c56376dff026a9631202 (diff)
downloadpoky-056fbc47c76f5ff238fb01302f0dce457dabc08d.tar.gz
bitbake: toaster: blocks for custom/highlighted navigation and breadcrumb links
Implement the navigation links as blocks so that each page can override and have its respective link appear highlighted. Make the build breadcrumb a block so that it is customizable to not be a link for the dashboard page. Reorder the page headers to be consistent order for extends, projecttags, localbreadcrumb, nav-links. [YOCTO #5916] [YOCTO #4258] (Bitbake rev: cb26c4df04170143babd6c9fd60600bfb31486ed) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/basebuildpage.html50
-rw-r--r--bitbake/lib/toaster/toastergui/templates/bpackage.html6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/builddashboard.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/configuration.html6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/configvars.html10
-rwxr-xr-xbitbake/lib/toaster/toastergui/templates/recipes.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/target.html10
-rw-r--r--bitbake/lib/toaster/toastergui/templates/tasks.html30
8 files changed, 101 insertions, 19 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
index 0ce5dbd27f..778c4d4af1 100644
--- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
+++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
@@ -9,7 +9,13 @@
9 <div class="section"> 9 <div class="section">
10 <ul class="breadcrumb" id="breadcrumb"> 10 <ul class="breadcrumb" id="breadcrumb">
11<li><a href="{% url 'all-builds' %}">All builds</a></li> 11<li><a href="{% url 'all-builds' %}">All builds</a></li>
12<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> 12 <li>
13 {% block parentbreadcrumb %}
14 <a href="{%url 'builddashboard' build.pk%}">
15 {{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"}})
16 </a>
17 {% endblock %}
18 </li>
13 {% block localbreadcrumb %}{% endblock %} 19 {% block localbreadcrumb %}{% endblock %}
14 </ul> 20 </ul>
15 <script> 21 <script>
@@ -28,19 +34,35 @@
28 <ul class="nav nav-list well"> 34 <ul class="nav nav-list well">
29 {% if build.target_set.all.0.is_image %} 35 {% if build.target_set.all.0.is_image %}
30 <li class="nav-header">Images</li> 36 <li class="nav-header">Images</li>
31 {% for t in build.get_sorted_target_list %} 37 {% block nav-target %}
32 <li><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li> 38 {% for t in build.get_sorted_target_list %}
33 {% endfor %} 39 <li><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li>
34 {% endif %} 40 {% endfor %}
35 <li class="nav-header">Build</li> 41 {% endblock %}
36 <li><a href="{% url 'configuration' build.pk %}">Configuration</a></li> 42 {% endif %}
37 <li><a href="{% url 'tasks' build.pk %}">Tasks</a></li> 43 <li class="nav-header">Build</li>
38 <li><a href="{% url 'recipes' build.pk %}">Recipes</a></li> 44 {% block nav-configuration %}
39 <li><a href="{% url 'packages' build.pk %}">Packages</a></li> 45 <li><a href="{% url 'configuration' build.pk %}">Configuration</a></li>
40 <li class="nav-header">Performance</li> 46 {% endblock %}
41 <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> 47 {% block nav-tasks %}
42 <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> 48 <li><a href="{% url 'tasks' build.pk %}">Tasks</a></li>
43 <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> 49 {% endblock %}
50 {% block nav-recipes %}
51 <li><a href="{% url 'recipes' build.pk %}">Recipes</a></li>
52 {% endblock %}
53 {% block nav-packages %}
54 <li><a href="{% url 'packages' build.pk %}">Packages</a></li>
55 {% endblock %}
56 <li class="nav-header">Performance</li>
57 {% block nav-buildtime %}
58 <li><a href="{% url 'buildtime' build.pk %}">Time</a></li>
59 {% endblock %}
60 {% block nav-cpuusage %}
61 <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li>
62 {% endblock %}
63 {% block nav-diskio %}
64 <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li>
65 {% endblock %}
44 </ul> 66 </ul>
45 </div> 67 </div>
46 <!-- end left sidebar container --> 68 <!-- end left sidebar container -->
diff --git a/bitbake/lib/toaster/toastergui/templates/bpackage.html b/bitbake/lib/toaster/toastergui/templates/bpackage.html
index dad0d7f48e..77f789484c 100644
--- a/bitbake/lib/toaster/toastergui/templates/bpackage.html
+++ b/bitbake/lib/toaster/toastergui/templates/bpackage.html
@@ -6,6 +6,10 @@
6<li>Packages</li> 6<li>Packages</li>
7{% endblock %} 7{% endblock %}
8 8
9{% block nav-packages %}
10 <li class="active"><a href="{% url 'packages' build.pk %}">Packages</a></li>
11{% endblock %}
12
9{% block buildinfomain %} 13{% block buildinfomain %}
10<div class="span10"> 14<div class="span10">
11<div class="page-header"> 15<div class="page-header">
@@ -30,7 +34,7 @@
30 </form> 34 </form>
31 </div> 35 </div>
32 </div> 36 </div>
33 37
34{% else %} 38{% else %}
35{% include "basetable_top.html" %} 39{% include "basetable_top.html" %}
36 40
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
index 9d91f4031f..65631286b1 100644
--- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html
+++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
@@ -2,6 +2,10 @@
2{% load humanize %} 2{% load humanize %}
3{% load projecttags %} 3{% load projecttags %}
4 4
5{% block parentbreadcrumb %}
6{{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"}})
7{% endblock %}
8
5{% block buildinfomain %} 9{% block buildinfomain %}
6<!-- page title --> 10<!-- page title -->
7<div class="row-fluid span10"> 11<div class="row-fluid span10">
diff --git a/bitbake/lib/toaster/toastergui/templates/configuration.html b/bitbake/lib/toaster/toastergui/templates/configuration.html
index 674f896b03..49a6a89d5c 100644
--- a/bitbake/lib/toaster/toastergui/templates/configuration.html
+++ b/bitbake/lib/toaster/toastergui/templates/configuration.html
@@ -1,9 +1,13 @@
1{% extends "basebuildpage.html" %} 1{% extends "basebuildpage.html" %}
2{% load projecttags %}
3
2{% block localbreadcrumb %} 4{% block localbreadcrumb %}
3<li>Configuration</li> 5<li>Configuration</li>
4{% endblock %} 6{% endblock %}
5 7
6{% load projecttags %} 8{% block nav-configuration %}
9 <li class="active"><a href="{% url 'configuration' build.pk %}">Configuration</a></li>
10{% endblock %}
7 11
8{% block buildinfomain %} 12{% block buildinfomain %}
9<!-- page title --> 13<!-- page title -->
diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/bitbake/lib/toaster/toastergui/templates/configvars.html
index 24cb2a5427..de4940e12e 100644
--- a/bitbake/lib/toaster/toastergui/templates/configvars.html
+++ b/bitbake/lib/toaster/toastergui/templates/configvars.html
@@ -1,9 +1,13 @@
1{% extends "basebuildpage.html" %} 1{% extends "basebuildpage.html" %}
2{% load projecttags %}
3
2{% block localbreadcrumb %} 4{% block localbreadcrumb %}
3<li>Configuration</li> 5<li>Configuration</li>
4{% endblock %} 6{% endblock %}
5 7
6{% load projecttags %} 8{% block nav-configuration %}
9 <li class="active"><a href="{% url 'configuration' build.pk %}">Configuration</a></li>
10{% endblock %}
7 11
8{% block buildinfomain %} 12{% block buildinfomain %}
9<!-- page title --> 13<!-- page title -->
@@ -30,7 +34,7 @@
30 34
31 <!-- variables --> 35 <!-- variables -->
32 <div id="variables" class="tab-pane"> 36 <div id="variables" class="tab-pane">
33 37
34 {% if objects.paginator.count == 0 %} 38 {% if objects.paginator.count == 0 %}
35 <div class="row-fluid"> 39 <div class="row-fluid">
36 <div class="alert"> 40 <div class="alert">
@@ -41,7 +45,7 @@
41 </form> 45 </form>
42 </div> 46 </div>
43 </div> 47 </div>
44 48
45 {% else %} 49 {% else %}
46 {% include "basetable_top.html" %} 50 {% include "basetable_top.html" %}
47 51
diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/bitbake/lib/toaster/toastergui/templates/recipes.html
index 22c3d1a5ac..907b83d269 100755
--- a/bitbake/lib/toaster/toastergui/templates/recipes.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipes.html
@@ -6,6 +6,10 @@
6<li>Recipes</li> 6<li>Recipes</li>
7{% endblock %} 7{% endblock %}
8 8
9{% block nav-recipes %}
10 <li class="active"><a href="{% url 'recipes' build.pk %}">Recipes</a></li>
11{% endblock %}
12
9{% block buildinfomain %} 13{% block buildinfomain %}
10<div class="span10"> 14<div class="span10">
11<div class="page-header"> 15<div class="page-header">
diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html
index 5396b17dc9..ceffada081 100644
--- a/bitbake/lib/toaster/toastergui/templates/target.html
+++ b/bitbake/lib/toaster/toastergui/templates/target.html
@@ -5,6 +5,16 @@
5 5
6{% load projecttags %} 6{% load projecttags %}
7 7
8{% block nav-target %}
9 {% for t in build.get_sorted_target_list %}
10 {% ifequal target.pk t.pk %}
11 <li class="active"><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li>
12 {% else %}
13 <li><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li>
14 {% endifequal %}
15 {% endfor %}
16{% endblock %}
17
8{% block buildinfomain %} 18{% block buildinfomain %}
9 19
10<div class="row-fluid span10"> 20<div class="row-fluid span10">
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
index ace30de3eb..8c73dc230e 100644
--- a/bitbake/lib/toaster/toastergui/templates/tasks.html
+++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
@@ -1,9 +1,39 @@
1{% extends "basebuildpage.html" %} 1{% extends "basebuildpage.html" %}
2{% load projecttags %} 2{% load projecttags %}
3
3{% block localbreadcrumb %} 4{% block localbreadcrumb %}
4<li>{{title}}</li> 5<li>{{title}}</li>
5{% endblock %} 6{% endblock %}
6 7
8{% block nav-tasks %}
9 {% if 'Tasks' == title %}
10 <li class="active"><a href="{% url 'tasks' build.pk %}">Tasks</a></li>
11 {% else %}
12 <li><a href="{% url 'tasks' build.pk %}">Tasks</a></li>
13 {% endif %}
14{% endblock %}
15{% block nav-buildtime %}
16 {% if 'Time' == title %}
17 <li class="active"><a href="{% url 'buildtime' build.pk %}">Time</a></li>
18 {% else %}
19 <li><a href="{% url 'buildtime' build.pk %}">Time</a></li>
20 {% endif %}
21{% endblock %}
22{% block nav-cpuusage %}
23 {% if 'CPU usage' == title %}
24 <li class="active"><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li>
25 {% else %}
26 <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li>
27 {% endif %}
28{% endblock %}
29{% block nav-diskio %}
30 {% if 'Disk I/O' == title %}
31 <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li>
32 {% else %}
33 <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li>
34 {% endif %}
35{% endblock %}
36
7{% block buildinfomain %} 37{% block buildinfomain %}
8<div class="span10"> 38<div class="span10">
9<div class="page-header"> 39<div class="page-header">