summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-09-04 11:05:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:27:57 +0100
commit446070074edbb47ca6a7d231ca45940bddb6a591 (patch)
tree16a0d7585acd25c88603f2a893bcb4a3aa64807d
parent6271fcb5896464d0c71172b02de548195191abf8 (diff)
downloadpoky-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>
-rw-r--r--bitbake/lib/toaster/toastergui/static/css/default.css5
-rw-r--r--bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html5
-rw-r--r--bitbake/lib/toaster/toastergui/templates/basebuildpage.html11
-rw-r--r--bitbake/lib/toaster/toastergui/templates/baseprojectpage.html6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/layerdetails.html5
5 files changed, 23 insertions, 9 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css
index 9723db36d0..cce3e315fc 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -10,6 +10,7 @@
10 10
11/* Style the breadcrumb */ 11/* Style the breadcrumb */
12.breadcrumb { display: inline-block; background-color: transparent; } 12.breadcrumb { display: inline-block; background-color: transparent; }
13.breadcrumb li:first-child { padding-right: 10px; }
13 14
14/* Styles for the help information */ 15/* Styles for the help information */
15.get-help { color: #CCCCCC; } 16.get-help { color: #CCCCCC; }
@@ -112,6 +113,10 @@ th > a, th > span { font-weight: normal; }
112.btn-group + .btn-group { margin-right: 10px; } 113.btn-group + .btn-group { margin-right: 10px; }
113.navbar-inner > .btn-group { margin-top: 6px; } 114.navbar-inner > .btn-group { margin-top: 6px; }
114 115
116/* Styles for the parent item in the left navigation */
117
118.nav > li > a.nav-parent { font-size: 18px; line-height: 25px; }
119
115/* Other styles */ 120/* Other styles */
116.dropdown-menu { padding: 10px; } 121.dropdown-menu { padding: 10px; }
117select { width: auto; } 122select { width: auto; }
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html b/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
index 8657845cd2..22ca50c0c3 100644
--- a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
+++ b/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
@@ -6,7 +6,8 @@
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 'project' build.project.id %}">{{build.project.name}}</a></li> 9 <li class="muted">{{build.project.name}}:</li>
10 <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</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> 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>
11 {% block localbreadcrumb %}{% endblock %} 12 {% block localbreadcrumb %}{% endblock %}
12 </ul> 13 </ul>
@@ -14,7 +15,7 @@
14 $( function () { 15 $( function () {
15 $('#breadcrumb > li').append('<span class="divider">&rarr;</span>'); 16 $('#breadcrumb > li').append('<span class="divider">&rarr;</span>');
16 $('#breadcrumb > li:last').addClass("active"); 17 $('#breadcrumb > li:last').addClass("active");
17 $('#breadcrumb > li:last > span').remove(); 18 $('#breadcrumb > li:last > span, #breadcrumb > li:first > span').remove();
18 }); 19 });
19 </script> 20 </script>
20 </div> <!--section--> 21 </div> <!--section-->
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">&rarr;</span>'); 24 $('#breadcrumb > li').append('<span class="divider">&rarr;</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 %}
diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
index 0db06a86da..668e0bf5ef 100644
--- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
+++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
@@ -21,14 +21,14 @@
21 <!-- only on config pages --> 21 <!-- only on config pages -->
22 <div id="config-nav" class="span2"> 22 <div id="config-nav" class="span2">
23 <ul class="nav nav-list well"> 23 <ul class="nav nav-list well">
24 <li class="nav-header">Configuration</li> 24 <li><a class="nav-parent" href="{% url 'project' project.id %}">Configuration</a></li>
25 <li><a href="{% url 'project' project.id %}">Basic configuration</a></li>
26 <li><a href="{% url 'projectconf' project.id %}">BitBake variables</a></li>
27 <li class="nav-header">Compatible metadata</li> 25 <li class="nav-header">Compatible metadata</li>
28<!-- <li><a href="all-image-recipes.html">Image recipes</a></li> --> 26<!-- <li><a href="all-image-recipes.html">Image recipes</a></li> -->
29 <li><a href="{% url 'projecttargets' project.id %}">Recipes</a></li> 27 <li><a href="{% url 'projecttargets' project.id %}">Recipes</a></li>
30 <li><a href="{% url 'projectmachines' project.id %}">Machines</a></li> 28 <li><a href="{% url 'projectmachines' project.id %}">Machines</a></li>
31 <li><a href="{% url 'projectlayers' project.id %}">Layers</a></li> 29 <li><a href="{% url 'projectlayers' project.id %}">Layers</a></li>
30 <li class="nav-header">Extra configuration</li>
31 <li><a href="{% url 'projectconf' project.id %}">BitBake variables</a></li>
32 </ul> 32 </ul>
33 </div> 33 </div>
34 <div class="span10"> 34 <div class="span10">
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index f7f5685fcb..7dd3db27a5 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
@@ -7,14 +7,15 @@
7 7
8<div class="section"> 8<div class="section">
9 <ul class="breadcrumb"> 9 <ul class="breadcrumb">
10 <li class="muted">{{project.name}}:</li>
10 <li> 11 <li>
11 <a href="{% url 'project' project.id %}">{{project.name}}</a> 12 <a href="{% url 'project' project.id %}">Configuration</a>
12 <span class="divider">&rarr;</span> 13 <span class="divider">&rarr;</span>
13 </li> 14 </li>
14 <li><a href="{% url 'projectlayers' project.id %}">Compatible layers</a> 15 <li><a href="{% url 'projectlayers' project.id %}">Compatible layers</a>
15 <span class="divider">&rarr;</span> 16 <span class="divider">&rarr;</span>
16 </li> 17 </li>
17 <li> 18 <li class="active">
18 {{layerversion.layer.name}} ({{layerversion.get_vcs_reference|truncatechars:13}}) 19 {{layerversion.layer.name}} ({{layerversion.get_vcs_reference|truncatechars:13}})
19 </li> 20 </li>
20 </ul> 21 </ul>