From ed9c309e814294c2b8ab31fae470e1ab63fb8a5d Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Mon, 4 Jul 2016 12:52:53 +0100 Subject: [PATCH] bitbake: toaster: fix layout for command-line builds in recent builds area Command-line builds were displayed incorrectly, so that the HTML elements for other builds were being "consumed" by the command-line build elements due to incorrect positioning of element end tags. Fix by ensuring end tags close elements in the right places. As the indentation was all over the place in the most recent builds section template, it was almost impossible to see what the problem was. So that was fixed, too. [YOCTO #9842] (Bitbake rev: 01659389813ad61d4f75b9f8d71528581322f0b0) Signed-off-by: Elliot Smith Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- .../toastergui/templates/mrb_section.html | 257 +++++++++--------- 1 file changed, 128 insertions(+), 129 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index 4b4e3e691b..b164269a13 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html @@ -3,6 +3,7 @@ {% load project_url_tag %} {% load humanize %} + -{%if mru %} +{% if mru %} - {%if mrb_type == 'project' %} -

- Latest project builds + {% if mrb_type == 'project' %} +

+ Latest project builds - {% if project.is_default %} - - {% endif %} -

+ {% if project.is_default %} + + {% endif %} + {% else %}
-

- Latest builds -

+

Latest builds

{% endif %} +
- {% for build in mru %} -
+ {% for build in mru %} +
{% if mrb_type != 'project' %} -
-
- - {{build.project.name}} - +
+
+ + {{build.project.name}} + +
-
{% endif %} +
- {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - - {% endif %} + {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} + + {% endif %} + {% if build.target_set.all.count > 0 %} - 1 %} - {{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 %} - {{target.target}} - {% endif %} - {% endfor %}" - {% endif %} - > - {% if build.target_set.all.0.task %} - {{build.get_sorted_target_list.0.target}}:{{build.target_set.all.0.task}} - {% else %} - {{build.get_sorted_target_list.0.target}} - {% endif %} + 1 %} - (+{{build.target_set.all.count|add:"-1"}}) + {{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 %} + {{target.target}} + {% endif %} + {% endfor %}" {% endif %} - - {% endif %} - {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - - {% endif %} -
- {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} -
- {% if build.completed_on|format_build_date %} - {{ build.completed_on|date:'d/m/y H:i' }} + > + {% if build.target_set.all.0.task %} + {{build.get_sorted_target_list.0.target}}:{{build.target_set.all.0.task}} {% else %} - {{ build.completed_on|date:'H:i' }} + {{build.get_sorted_target_list.0.target}} {% endif %} -
- {% endif %} - {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} + + {% if build.target_set.all.count > 1 %} + (+{{build.target_set.all.count|add:"-1"}}) + {% endif %} + + {% endif %} + {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} + + {% endif %} +
+ + {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}
- {% if build.errors.count %} + {% if build.completed_on|format_build_date %} + {{build.completed_on|date:'d/m/y H:i'}} + {% else %} + {{ build.completed_on|date:'H:i' }} + {% endif %} +
+ {% endif %} + + {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} +
+ {% if build.errors.count %} - {{build.errors.count}} error{{build.errors.count|pluralize}} - {% endif %} + + {{build.errors.count}} error{{build.errors.count|pluralize}} + + {% endif %}
+
- {% if build.warnings.count %} + {% if build.warnings.count %} - {{build.warnings.count}} warning{{build.warnings.count|pluralize}} - {% endif %} + + {{build.warnings.count}} warning{{build.warnings.count|pluralize}} + + {% endif %}
+
Build time: {{ build.timespent_seconds|sectohms }} + {% if build.project.is_default %} - - + + {% else %} - - - Rebuild - + + + Rebuild + {% endif %}
- {%endif%} + {% endif %} - {%if build.outcome == build.IN_PROGRESS %} - -
-
-
+ {% if build.outcome == build.IN_PROGRESS %} + + +
+
+
+
+
+
+ +
+ {{build.completeper}}% of tasks complete + {# No build cancel for command line builds project #} + {% if build.project.is_default %} + + {% else %} + + + Cancel + + {% endif %} +
+ {% endif %} {# end if in progress #} + + {% if build.outcome == build.CANCELLED %} +
+ Build cancelled +
+ +
+ + + Rebuild + +
+ {% endif %} +
-
-
{{build.completeper}}% of tasks complete - {# No build cancel for command line builds project #} - {% if build.project.is_default %} - - {% else %} - - - Cancel - -
- {% endif %} - - {%endif%} {# end if in progress #} - - {% if build.outcome == build.CANCELLED %} -
- Build cancelled -
-
- - - Rebuild - -
- {% endif %} + {% endfor %}
-
- {% endfor %} -
- -{%endif%} - +{% endif %} \ No newline at end of file