From 2251426ae420640c082ec0d0109b9be435075411 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Wed, 11 Dec 2013 16:42:34 +0000 Subject: bitbake: toaster: Create the base page navigation structure Updating the general container pages to use the graphical design and features from the design phase. In the process of adapting the Simple UI to the designed interface, we create all the pages and the navigation structure for the Toaster GUI. Views for each page have been added, and the url mapping has been updated to reflect newly added pages. The table page has been refactored to be component-oriented instead of class-oriented in order to facilitate reusage. Changes are made in different layers of the template (base, basetable) in order to maximize code reuse among different pages in the build. (Bitbake rev: d31f039ae31b77023722c06e66542751536a1362) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- .../lib/toaster/toastergui/templates/build.html | 115 +++++++++++++++------ 1 file changed, 84 insertions(+), 31 deletions(-) (limited to 'bitbake/lib/toaster/toastergui/templates/build.html') diff --git a/bitbake/lib/toaster/toastergui/templates/build.html b/bitbake/lib/toaster/toastergui/templates/build.html index 4fa87d5271..27ce1ccbc5 100644 --- a/bitbake/lib/toaster/toastergui/templates/build.html +++ b/bitbake/lib/toaster/toastergui/templates/build.html @@ -1,43 +1,96 @@ -{% extends "basetable.html" %} +{% extends "base.html" %} + + +{% load projecttags %} +{% load humanize %} + +{% block pagecontent %} +
+ + +{{build_mru}} +{% for build in mru %} +
+
+ +{%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} +
+{% if build.errors_no %} + {{build.errors_no}} error{{build.errors_no|pluralize}} +{% endif %} +
+
+{% if build.warnings_no %} + {{build.warnings_no}} warning{{build.warnings_no|pluralize}} +{% endif %} +
+
+ Build time: {{ build|timespent }} +
+{%endif%}{%if build.outcome == build.IN_PROGRESS %} +
+
+
+
+
+
ETA: in {{build.eta|naturaltime}}
+{%endif%} +
+
+ +{% endfor %} -{% block pagename %} -

Toaster - Builds

-{% endblock %} -{% block pagetable %} + + +{% include "basetable_top.html" %} - {% load projecttags %} - Outcome - Started On - Completed On - Target - Machine - Time - Errors - Warnings - Output - Log - Bitbake Version - Build Name + Outcome + Target + Machine + Started on + Completed on + Failed tasks + Errors + Warnings + Time + Log + Output + {% for build in objects %} - {{build.get_outcome_display}} - {{build.started_on}} - {{build.completed_on}} - {% for t in build.target_set.all %}{%if t.is_image %}{% endif %}{{t.target}}{% if t.is_image %}{% endif %}
{% endfor %} - {{build.machine}} - {% time_difference build.started_on build.completed_on %} - {{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}

{{error.message}}

{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %} - {{build.warnings_no}}:{% if build.warnings_no %}{% for warning in logs %}{% if warning.build == build %}{% if warning.level == 1 %}

{{warning.message}}

{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %} - {% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}{{build.image_fstypes}}{% endif %}{% endfor %}{% endif %} - {{build.cooker_log_path}} - {{build.bitbake_version}} - {{build.build_name}} + {%if build.outcome == build.SUCCEEDED%}{%elif build.outcome == build.FAILED%}{%else%}{%endif%} + {% for t in build.target_set.all %}{%if t.is_image %}{% endif %}{{t.target}}{% if t.is_image %}{% endif %}
{% endfor %} + {{build.machine}} + {{build.started_on}} + {{build.completed_on}} + + {% if build.errors_no %}{{build.errors_no}} error{{build.errors_no|pluralize}}{%endif%} + {% if build.warnings_no %}{{build.warnings_no}} warning{{build.warnings_no|pluralize}}{%endif%} + {{build|timespent}} + {{build.log}} + {% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}{{build.image_fstypes}}{% endif %}{% endfor %}{% endif %} {% endfor %} -{% endblock %} +{% include "basetable_bottom.html" %} + +
+{% endblock %} -- cgit v1.2.3-54-g00ecf