diff options
| author | Belen Barros Pena <belen.barros.pena@intel.com> | 2015-08-04 16:07:07 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-06 16:04:41 -0500 |
| commit | 569567d3b3811eb206a143479d624d82811b3a14 (patch) | |
| tree | 22a873a33a3a106f099f60c2d5144db39c2a6bb5 | |
| parent | d47358fc952800e0115cea25d7cb4c07c49eaaf9 (diff) | |
| download | poky-569567d3b3811eb206a143479d624d82811b3a14.tar.gz | |
bitbake: toastergui: breadcrumb fixes
Make sure that we use the correct html entity
for the breadcrumb dividers, and remove the
'all builds' item from the history pages: all
breadcrumbs should now have the project name as
their first element, since the 'all builds' page
can be reached using the global naviation in the
top bar.
(Bitbake rev: c97f658f4b2131f280c364c2209efd28878570dc)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 4 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html b/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html index d324c90712..8657845cd2 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html | |||
| @@ -6,14 +6,13 @@ | |||
| 6 | <!-- Breadcrumbs --> | 6 | <!-- Breadcrumbs --> |
| 7 | <div class="section"> | 7 | <div class="section"> |
| 8 | <ul class="breadcrumb" id="breadcrumb"> | 8 | <ul class="breadcrumb" id="breadcrumb"> |
| 9 | <li><a href="{% url 'all-builds' %}">All builds</a></li> | ||
| 10 | <li><a href="{% url 'project' build.project.id %}">{{build.project.name}}</a></li> | 9 | <li><a href="{% url 'project' build.project.id %}">{{build.project.name}}</a></li> |
| 11 | <li><a href="{%url 'builddashboard' build.pk%}">{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} ({{build.completed_on|date:"d/m/y H:i"}})</a></li> | 10 | <li><a href="{%url 'builddashboard' build.pk%}">{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} ({{build.completed_on|date:"d/m/y H:i"}})</a></li> |
| 12 | {% block localbreadcrumb %}{% endblock %} | 11 | {% block localbreadcrumb %}{% endblock %} |
| 13 | </ul> | 12 | </ul> |
| 14 | <script> | 13 | <script> |
| 15 | $( function () { | 14 | $( function () { |
| 16 | $('#breadcrumb > li').append("<span class=\"divider\">→</span>"); | 15 | $('#breadcrumb > li').append('<span class="divider">→</span>'); |
| 17 | $('#breadcrumb > li:last').addClass("active"); | 16 | $('#breadcrumb > li:last').addClass("active"); |
| 18 | $('#breadcrumb > li:last > span').remove(); | 17 | $('#breadcrumb > li:last > span').remove(); |
| 19 | }); | 18 | }); |
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index 105ad85ed4..f399ba4625 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |||
| @@ -8,7 +8,6 @@ | |||
| 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 'all-builds' %}">All builds</a></li> | ||
| 12 | <li><a href="{% url 'project' build.project.id %}">{{build.project.name}}</a></li> | 11 | <li><a href="{% url 'project' build.project.id %}">{{build.project.name}}</a></li> |
| 13 | <li> | 12 | <li> |
| 14 | {% block parentbreadcrumb %} | 13 | {% block parentbreadcrumb %} |
| @@ -21,7 +20,7 @@ | |||
| 21 | </ul> | 20 | </ul> |
| 22 | <script> | 21 | <script> |
| 23 | $( function () { | 22 | $( function () { |
| 24 | $('#breadcrumb > li').append("<span class=\"divider\">→</span>"); | 23 | $('#breadcrumb > li').append('<span class="divider">→</span>'); |
| 25 | $('#breadcrumb > li:last').addClass("active"); | 24 | $('#breadcrumb > li:last').addClass("active"); |
| 26 | $('#breadcrumb > li:last > span').remove(); | 25 | $('#breadcrumb > li:last > span').remove(); |
| 27 | console.log("done"); | 26 | console.log("done"); |
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 2f875ebe14..f7f5685fcb 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html | |||
| @@ -9,10 +9,10 @@ | |||
| 9 | <ul class="breadcrumb"> | 9 | <ul class="breadcrumb"> |
| 10 | <li> | 10 | <li> |
| 11 | <a href="{% url 'project' project.id %}">{{project.name}}</a> | 11 | <a href="{% url 'project' project.id %}">{{project.name}}</a> |
| 12 | <span class="divider">→</span> | 12 | <span class="divider">→</span> |
| 13 | </li> | 13 | </li> |
| 14 | <li><a href="{% url 'projectlayers' project.id %}">Compatible layers</a> | 14 | <li><a href="{% url 'projectlayers' project.id %}">Compatible layers</a> |
| 15 | <span class="divider">→</span> | 15 | <span class="divider">→</span> |
| 16 | </li> | 16 | </li> |
| 17 | <li> | 17 | <li> |
| 18 | {{layerversion.layer.name}} ({{layerversion.get_vcs_reference|truncatechars:13}}) | 18 | {{layerversion.layer.name}} ({{layerversion.get_vcs_reference|truncatechars:13}}) |
