diff options
Diffstat (limited to 'bitbake/lib/toaster')
6 files changed, 6 insertions, 27 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index c1cb93c6e5..ae9fa06071 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css | |||
@@ -10,7 +10,6 @@ | |||
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; } | ||
14 | 13 | ||
15 | /* Styles for the help information */ | 14 | /* Styles for the help information */ |
16 | .get-help { color: #CCCCCC; } | 15 | .get-help { color: #CCCCCC; } |
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 8c2ec4cdd9..663b3c6bf3 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js | |||
@@ -32,21 +32,6 @@ function layerDetailsPageInit (ctx) { | |||
32 | } | 32 | } |
33 | }); | 33 | }); |
34 | 34 | ||
35 | |||
36 | $(".breadcrumb li:first a").click(function(e){ | ||
37 | e.preventDefault(); | ||
38 | /* By default this link goes to the project configuration page. However | ||
39 | * if we have some builds we go there instead of the default href | ||
40 | */ | ||
41 | libtoaster.getProjectInfo(libtoaster.ctx.projectPageUrl, function(prjInfo){ | ||
42 | if (prjInfo.builds && prjInfo.builds.length > 0) { | ||
43 | window.location.replace(libtoaster.ctx.projectBuildsUrl); | ||
44 | } else { | ||
45 | window.location.replace(libtoaster.ctx.projectPageUrl); | ||
46 | } | ||
47 | }); | ||
48 | }); | ||
49 | |||
50 | function addRemoveDep(depLayerId, add, doneCb) { | 35 | function addRemoveDep(depLayerId, add, doneCb) { |
51 | var data = { layer_version_id : ctx.layerVersion.id }; | 36 | var data = { layer_version_id : ctx.layerVersion.id }; |
52 | if (add) | 37 | if (add) |
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html b/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html index ffe7aa4f8d..e350c1a859 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html | |||
@@ -6,7 +6,7 @@ | |||
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 class="muted">{{build.project.name}}:</li> | 9 | <li><a href="{% url 'project' build.project.id %}">{{build.project.name}}</a></li> |
10 | <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li> | 10 | <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li> |
11 | <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> | 11 | <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 | {% block localbreadcrumb %}{% endblock %} | 12 | {% block localbreadcrumb %}{% endblock %} |
@@ -15,7 +15,7 @@ | |||
15 | $( function () { | 15 | $( function () { |
16 | $('#breadcrumb > li').append('<span class="divider">→</span>'); | 16 | $('#breadcrumb > li').append('<span class="divider">→</span>'); |
17 | $('#breadcrumb > li:last').addClass("active"); | 17 | $('#breadcrumb > li:last').addClass("active"); |
18 | $('#breadcrumb > li:last > span, #breadcrumb > li:first > span').remove(); | 18 | $('#breadcrumb > li:last > span').remove(); |
19 | }); | 19 | }); |
20 | </script> | 20 | </script> |
21 | </div> <!--section--> | 21 | </div> <!--section--> |
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index a9048d3bb2..35718694ea 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |||
@@ -8,7 +8,7 @@ | |||
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 class="muted">{{build.project.name}}:</li> | 11 | <li><a href="{% url 'project' build.project.id %}">{{build.project.name}}</a></li> |
12 | <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li> | 12 | <li><a href="{% url 'projectbuilds' build.project.id %}">Builds</a></li> |
13 | <li> | 13 | <li> |
14 | {% block parentbreadcrumb %} | 14 | {% block parentbreadcrumb %} |
@@ -23,7 +23,7 @@ | |||
23 | $( function () { | 23 | $( function () { |
24 | $('#breadcrumb > li').append('<span class="divider">→</span>'); | 24 | $('#breadcrumb > li').append('<span class="divider">→</span>'); |
25 | $('#breadcrumb > li:last').addClass("active"); | 25 | $('#breadcrumb > li:last').addClass("active"); |
26 | $('#breadcrumb > li:last > span, #breadcrumb > li:first > span').remove(); | 26 | $('#breadcrumb > li:last > span').remove(); |
27 | }); | 27 | }); |
28 | </script> | 28 | </script> |
29 | </div> | 29 | </div> |
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 7fe365da38..61ae52c2f8 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html | |||
@@ -8,9 +8,8 @@ | |||
8 | 8 | ||
9 | <div class="section"> | 9 | <div class="section"> |
10 | <ul class="breadcrumb"> | 10 | <ul class="breadcrumb"> |
11 | <li class="muted">{{project.name}}:</li> | ||
12 | <li> | 11 | <li> |
13 | <a href="{% url 'project' project.id %}">Configuration</a> | 12 | <a href="{% url 'project' project.id %}">{{project.name}}</a> |
14 | <span class="divider">→</span> | 13 | <span class="divider">→</span> |
15 | </li> | 14 | </li> |
16 | <li><a href="{% url 'projectlayers' project.id %}">Compatible layers</a> | 15 | <li><a href="{% url 'projectlayers' project.id %}">Compatible layers</a> |
@@ -46,7 +45,6 @@ | |||
46 | 45 | ||
47 | $(document).ready(function (){ | 46 | $(document).ready(function (){ |
48 | var ctx = { | 47 | var ctx = { |
49 | projectBuildsUrl : "{% url 'projectbuilds' project.id %}", | ||
50 | xhrUpdateLayerUrl : "{% url 'xhr_updatelayer' %}", | 48 | xhrUpdateLayerUrl : "{% url 'xhr_updatelayer' %}", |
51 | layerVersion : { | 49 | layerVersion : { |
52 | name : "{{layerversion.layer.name}}", | 50 | name : "{{layerversion.layer.name}}", |
diff --git a/bitbake/lib/toaster/toastergui/templates/recipedetails.html b/bitbake/lib/toaster/toastergui/templates/recipedetails.html index aed0492aeb..23aa171ce6 100644 --- a/bitbake/lib/toaster/toastergui/templates/recipedetails.html +++ b/bitbake/lib/toaster/toastergui/templates/recipedetails.html | |||
@@ -6,11 +6,8 @@ | |||
6 | 6 | ||
7 | <div class="section"> | 7 | <div class="section"> |
8 | <ul class="breadcrumb"> | 8 | <ul class="breadcrumb"> |
9 | <li class="muted"> | ||
10 | {{project.name}} | ||
11 | </li> | ||
12 | <li> | 9 | <li> |
13 | <a href="{% url 'project' project.id %}">Configuration</a> | 10 | <a href="{% url 'project' project.id %}">{{project.name}}</a> |
14 | <span class="divider">→</span> | 11 | <span class="divider">→</span> |
15 | </li> | 12 | </li> |
16 | <li> | 13 | <li> |