diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2015-09-04 11:05:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-09 14:27:57 +0100 |
commit | 446070074edbb47ca6a7d231ca45940bddb6a591 (patch) | |
tree | 16a0d7585acd25c88603f2a893bcb4a3aa64807d /bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |
parent | 6271fcb5896464d0c71172b02de548195191abf8 (diff) | |
download | poky-446070074edbb47ca6a7d231ca45940bddb6a591.tar.gz |
bitbake: toaster: Changes to navigation
This patch:
* Changes the breadcrumb to provide access to either
the project builds or the project configuration, as
appropriate
* Changes the left navigation in the project configuration
to reflect the hierarchical relationship between the
basic configuration and all other configuration pages
* Changes the left navigation in the build history to bring
it in line with the changes in the project configuration
This way the breadcrumb explicitly exposes the hierarchy
of the application, which is its correct behaviour, making it
easier to move around within Toaster.
(Bitbake rev: 135dff67216759286f584e501583584a9cb09f27)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/basebuildpage.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/basebuildpage.html | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index f399ba4625..d441df84e0 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |||
@@ -8,7 +8,8 @@ | |||
8 | <!-- Breadcrumbs --> | 8 | <!-- Breadcrumbs --> |
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 'project' build.project.id %}">{{build.project.name}}</a></li> | 11 | <li class="muted">{{build.project.name}}:</li> |
12 | <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li> | ||
12 | <li> | 13 | <li> |
13 | {% block parentbreadcrumb %} | 14 | {% block parentbreadcrumb %} |
14 | <a href="{%url 'builddashboard' build.pk%}"> | 15 | <a href="{%url 'builddashboard' build.pk%}"> |
@@ -22,7 +23,7 @@ | |||
22 | $( function () { | 23 | $( function () { |
23 | $('#breadcrumb > li').append('<span class="divider">→</span>'); | 24 | $('#breadcrumb > li').append('<span class="divider">→</span>'); |
24 | $('#breadcrumb > li:last').addClass("active"); | 25 | $('#breadcrumb > li:last').addClass("active"); |
25 | $('#breadcrumb > li:last > span').remove(); | 26 | $('#breadcrumb > li:last > span, #breadcrumb > li:first > span').remove(); |
26 | console.log("done"); | 27 | console.log("done"); |
27 | }); | 28 | }); |
28 | </script> | 29 | </script> |
@@ -33,6 +34,12 @@ | |||
33 | <!-- begin left sidebar container --> | 34 | <!-- begin left sidebar container --> |
34 | <div id="nav" class="span2"> | 35 | <div id="nav" class="span2"> |
35 | <ul class="nav nav-list well"> | 36 | <ul class="nav nav-list well"> |
37 | <li | ||
38 | {% if request.resolver_match.url_name == 'builddashboard' %} | ||
39 | class="active" | ||
40 | {% endif %} > | ||
41 | <a class="nav-parent" href="{% url 'builddashboard' build.pk %}">Build summary</a> | ||
42 | </li> | ||
36 | {% if build.target_set.all.0.is_image and build.outcome == 0 %} | 43 | {% if build.target_set.all.0.is_image and build.outcome == 0 %} |
37 | <li class="nav-header">Images</li> | 44 | <li class="nav-header">Images</li> |
38 | {% block nav-target %} | 45 | {% block nav-target %} |