From: Belen Barros Pena <[email protected]> * 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 Signed-off-by: Belen Barros Pena <[email protected]> --- bitbake/lib/toaster/toastergui/static/js/libtoaster.js | 4 ++-- bitbake/lib/toaster/toastergui/templates/mrb_section.html | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js index 1012034..e2dba48 100644 --- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js +++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js @@ -443,8 +443,8 @@ $(document).ready(function() { $('.tooltip').hide(); }); - // enable help information tooltip - $(".get-help").tooltip({container:'body', html:true, delay:{show:300}}); + // enable help information and multi target build tooltips + $(".get-help, .multitarget-build").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 2f4820c..758a76c 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html @@ -36,10 +36,11 @@ <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}"> {% endif %} {% if build.target_set.all.count > 0 %} - <span data-toggle="tooltip" + <span class="multitarget-build" {% 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 %} -- 2.5.4 (Apple Git-61) -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
