summaryrefslogtreecommitdiffstats
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
parent4d0ba0fca859973ff68dc5e929f19f3c4bcb10f5 (diff)
downloadpoky-contrib-48622e1d6b9a04a301961b995ae26eb3ad9f72e7.tar.gz
poky-contrib-48622e1d6b9a04a301961b995ae26eb3ad9f72e7.tar.bz2
poky-contrib-48622e1d6b9a04a301961b995ae26eb3ad9f72e7.zip
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>
-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() {
$('.tooltip').hide();
});
- // enable help information tooltip
- $(".get-help").tooltip({container:'body', html:true, delay:{show:300}});
+ /* Initialise bootstrap tooltips */
+ $(".get-help, [data-toggle=tooltip]").tooltip({
+ container : 'body',
+ html : true,
+ delay: { show : 300 }
+ });
// show help bubble only on hover inside tables
$(".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 @@
{% if build.target_set.all.count > 0 %}
<span data-toggle="tooltip"
{% if build.target_set.all.count > 1 %}
- title="Targets:
- {% for target in build.target_set.all %}
+ {{build.get_sorted_target_list.0.target}}
+ title="Recipes:
+ {% for target in build.get_sorted_target_list %}
{% if target.task %}
{{target.target}}:{{target.task}}
{% else %}
@@ -49,12 +50,12 @@
{% endif %}
>
{% if build.target_set.all.0.task %}
- {{build.target_set.all.0.target}}:{{build.target_set.all.0.task}}
+ {{build.get_sorted_target_list.0.target}}:{{build.target_set.all.0.task}}
{% else %}
- {{build.target_set.all.0.target}}
+ {{build.get_sorted_target_list.0.target}}
{% endif %}
{% if build.target_set.all.count > 1 %}
- (+ {{build.target_set.all.count|add:"-1"}})
+ (+{{build.target_set.all.count|add:"-1"}})
{% endif %}
</span>
{% endif %}