summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2016-02-10 00:05:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-10 13:33:40 +0000
commit48622e1d6b9a04a301961b995ae26eb3ad9f72e7 (patch)
treec735c31a125d4cbf50be7cecc8e81d6d5c987cce /bitbake
parent4d0ba0fca859973ff68dc5e929f19f3c4bcb10f5 (diff)
downloadpoky-48622e1d6b9a04a301961b995ae26eb3ad9f72e7.tar.gz
bitbake: toaster: build section Improve display of builds when > 1 targets
* Display always the first target in alphabetical order to match what we do in the breadcrumbs and the build dashboard heading * Remove the extra space between the '+' and the additional number of targets * Make sure the tooltip with the full target list takes the Bootstrap tooltip styles * Replace the word 'targets' in the tooltip with 'recipes', since that's how we call build targets everywhere else in Toaster (Bitbake rev: 3b8747d0af4b9164e973940ed97751c951e74110) 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>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/libtoaster.js8
-rw-r--r--bitbake/lib/toaster/toastergui/templates/mrb_section.html11
2 files changed, 12 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
index e81f567057..a3858ec7ef 100644
--- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
+++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
@@ -470,8 +470,12 @@ $(document).ready(function() {
470 $('.tooltip').hide(); 470 $('.tooltip').hide();
471 }); 471 });
472 472
473 // enable help information tooltip 473 /* Initialise bootstrap tooltips */
474 $(".get-help").tooltip({container:'body', html:true, delay:{show:300}}); 474 $(".get-help, [data-toggle=tooltip]").tooltip({
475 container : 'body',
476 html : true,
477 delay: { show : 300 }
478 });
475 479
476 // show help bubble only on hover inside tables 480 // show help bubble only on hover inside tables
477 $(".hover-help").css("visibility","hidden"); 481 $(".hover-help").css("visibility","hidden");
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
index da1253e1d5..cceee7d1f3 100644
--- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html
+++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
@@ -38,8 +38,9 @@
38 {% if build.target_set.all.count > 0 %} 38 {% if build.target_set.all.count > 0 %}
39 <span data-toggle="tooltip" 39 <span data-toggle="tooltip"
40 {% if build.target_set.all.count > 1 %} 40 {% if build.target_set.all.count > 1 %}
41 title="Targets: 41 {{build.get_sorted_target_list.0.target}}
42 {% for target in build.target_set.all %} 42 title="Recipes:
43 {% for target in build.get_sorted_target_list %}
43 {% if target.task %} 44 {% if target.task %}
44 {{target.target}}:{{target.task}} 45 {{target.target}}:{{target.task}}
45 {% else %} 46 {% else %}
@@ -49,12 +50,12 @@
49 {% endif %} 50 {% endif %}
50 > 51 >
51 {% if build.target_set.all.0.task %} 52 {% if build.target_set.all.0.task %}
52 {{build.target_set.all.0.target}}:{{build.target_set.all.0.task}} 53 {{build.get_sorted_target_list.0.target}}:{{build.target_set.all.0.task}}
53 {% else %} 54 {% else %}
54 {{build.target_set.all.0.target}} 55 {{build.get_sorted_target_list.0.target}}
55 {% endif %} 56 {% endif %}
56 {% if build.target_set.all.count > 1 %} 57 {% if build.target_set.all.count > 1 %}
57 (+ {{build.target_set.all.count|add:"-1"}}) 58 (+{{build.target_set.all.count|add:"-1"}})
58 {% endif %} 59 {% endif %}
59 </span> 60 </span>
60 {% endif %} 61 {% endif %}