Order	Configuration file	Operation	Line number
{{forloop.counter}}	{{vh.file_name}}	{{vh.operation}}	{{vh.line_number}}

Order	Configuration file	Operation	Line
{{forloop.counter}}	{{vh.file_name}}	{{vh.operation}}	{{vh.line_number}}

Version	Size	- + Relationship type
@@ -41,7 +41,7 @@	{{runtime_dep.version}}	{{runtime_dep.size\|filtered_filesizeformat}}

- @@ -22,28 +22,33 @@

- + Recipe details
- + Packages ({{package_count}})
- + Build dependencies ({{object.r_dependencies_recipe.all.count}})
- + Reverse build dependencies ({{object.r_dependencies_depends.all.count}})

- + Layer: {{layer.name}}
- + Recipe file: {{object.file_path}} {% if object.pathflags %}({{object.pathflags}}){% endif %}
- + Layer branch: {{layer_version.branch}}
- + Layer commit: {{layer_version.commit}}
- + the build"> PROVIDES: {% for provider in object.provides_set.all %}{{ provider.name }} {% endfor %}

- + - + @@ -123,26 +148,30 @@ - + - + - @@ -151,6 +180,7 @@ {% endfor %}

- + Order	- + Task	- + Executed	- + Outcome	- + Cache attempt
{{task.order}}	{{task.order}}	- {{task.task_name}} - {% if task.get_description %} {% endif %} + {{task.task_name}} + {% if task.get_description %} + {% endif %}	{{task.get_executed_display}}	{{task.get_executed_display}}	- {{task.get_outcome_display}} +	{{task.get_outcome_display}} {% if task.outcome = task.OUTCOME_FAILED %} - + {% endif %}	{% ifnotequal task.sstate_result task.SSTATE_NA %} - {{task.get_sstate_result_display}} + {{task.get_sstate_result_display}} {% endifnotequal %}

@@ -177,13 +207,13 @@ {{rr.depends_on.name}} {% if rr.via %} - satisfied via {{rr.via.name}} - + {{rr.via.name}} in the {{rr.depends_on.name}} recipe"> {% endif %} - {{rr.depends_on.version}} + {{rr.depends_on.version}} {% endfor %} @@ -216,13 +246,13 @@ {{rr.recipe.name}} {% if rr.via %} - satisfied via {{rr.via.name}} - + {{rr.via.name}} in the {{rr.depends_on.name}} recipe"> {% endif %} - {{rr.recipe.version}} + {{rr.recipe.version}} {% endfor %} @@ -257,7 +287,7 @@ {% if object.section %}

Section - +

{% endif %} diff --git a/lib/toaster/toastergui/templates/recipe_packages.html b/lib/toaster/toastergui/templates/recipe_packages.html index 2c2efd8c17b..37a586f3891 100644 --- a/lib/toaster/toastergui/templates/recipe_packages.html +++ b/lib/toaster/toastergui/templates/recipe_packages.html @@ -13,7 +13,7 @@

- @@ -21,28 +21,33 @@

- + Recipe details
- - + + Packages ({{object_count}})
- + Build dependencies ({{recipe.r_dependencies_recipe.all.count}})
- + Reverse build dependencies ({{recipe.r_dependencies_depends.all.count}})

{{package.version}}_{{package.revision}}

About {{recipe.name}}

Approx. packages included diff --git a/lib/toaster/toastergui/templates/snippets/gitrev_popover.html b/lib/toaster/toastergui/templates/snippets/gitrev_popover.html index 281a3bd765a..c1e3dabfbf9 100644 --- a/lib/toaster/toastergui/templates/snippets/gitrev_popover.html +++ b/lib/toaster/toastergui/templates/snippets/gitrev_popover.html @@ -1,6 +1,6 @@ {% load projecttags %} {% if vcs_ref|is_shaid %} - + {{vcs_ref|truncatechars:10}} {% else %} diff --git a/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html b/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html index 5be409ca448..273437e380c 100644 --- a/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html +++ b/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html @@ -5,7 +5,7 @@ {% with count_package=package_deps.packages|length %} {% if count_package > 0 %} - {% for dep in package_deps.packages %}
{% if extra.add_links %} diff --git a/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html b/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html index 65c2b29d0be..e6ef816e7cc 100644 --- a/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html +++ b/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html @@ -5,7 +5,7 @@ {% with count_package=package_deps.packages|length %} {% if count_package > 0 %} - {% for dep in package_deps.packages|dictsort:"package.name" %}
{% if extra.add_links %} diff --git a/lib/toaster/toastergui/templates/target.html b/lib/toaster/toastergui/templates/target.html index 0b2fe99577d..1924a0dad73 100644 --- a/lib/toaster/toastergui/templates/target.html +++ b/lib/toaster/toastergui/templates/target.html @@ -18,7 +18,7 @@ {% block buildinfomain %}
-
+

{% if request.GET.search and objects.paginator.count > 0 %} {{objects.paginator.count}} package{{objects.paginator.count|pluralize}} found @@ -30,16 +30,16 @@

-
+

- + Packages included ({{target.package_count}} - {{packages_sum|filtered_filesizeformat}})

- + Directory structure
@@ -51,6 +51,6 @@ {% include "toastertable.html" %} {% endwith %}
-
> +
{% endblock buildinfomain %} diff --git a/lib/toaster/toastergui/templates/task.html b/lib/toaster/toastergui/templates/task.html index 77391b4e359..86789bd0b17 100644 --- a/lib/toaster/toastergui/templates/task.html +++ b/lib/toaster/toastergui/templates/task.html @@ -13,19 +13,20 @@

-
+

{{task.recipe.name}}_{{task.recipe.version}} {{task.task_name}}

{# Outcome section #}
{{task.get_outcome_display}} - +
{%if task.task_executed %} {# executed tasks outcome #} {% if task.logfile %} - Download task log + Download task log {% endif %} {# show stack trace for failed task #} {% if task.outcome == task.OUTCOME_FAILED and log_head %} @@ -41,31 +42,55 @@ {# not executed tasks outcome #} {% if task.outcome == task.OUTCOME_PREBUILT %} {% if not showing_matches %} - Match to tasks in previous builds + Match to tasks in previous builds {% elif matching_tasks %}
Prebuilt task could be based on - +
+
@@ -73,27 +98,34 @@ {% for match in matching_tasks %} {% endfor %}

- + Recipe - + Task - + Executed - + Outcome - + Build completed on
- {{match.recipe.name}} + {{match.recipe.name}} {{match.task_name}} {% if task.get_description %} - + {% endif %} - {{match.get_executed_display}} + {{match.get_executed_display}} - {{match.get_outcome_display}} + {{match.get_outcome_display}} + - {{match.build.completed_on|date:"d/m/y H:i"}} + {{match.build.completed_on|date:"d/m/y H:i"}}

+
{% else %}
We have found no tasks matching this prebuilt task
@@ -103,10 +135,11 @@ {% elif task.outcome == task.OUTCOME_COVERED %}

- Task covered by + Task covered by

-
+
{% for t in covered_by %}
Download task log + Download task log {% endif %} {% endfor %} @@ -138,17 +172,25 @@ {% if task.task_executed %}
Executed - + {% else %} -
+
Not Executed - + {% endif %}

- + Task inputs signature

@@ -157,19 +199,29 @@ {% if task.sstate_result != task.SSTATE_NA %}

Attempting to restore output from sstate cache - +

- + File searched for

{{task.path_to_sstate_obj}}

- + URI(s) searched
-
{% for uri in uri_list %}
{{uri}}
{% endfor %}
+
{% for uri in uri_list %}
{{uri}}
{% endfor %}

{% endif %} {% if task.sstate_result == task.SSTATE_MISS %} @@ -177,7 +229,7 @@ File not in sstate cache. Running the real task instead.
{% elif task.sstate_result == task.SSTATE_FAILED%} -
+
Failed to restore output from sstate cache. The file was found but could not be unpacked.

@@ -193,13 +245,16 @@ {% endif %}

- + Task order

{{task.order}}
{% if task.task_executed %}
- + Task script type

{{task.get_script_type_display}}
@@ -212,29 +267,31 @@
{{task.source_url}}
-->
- + Dependencies

-
- {% for dep in deps %} -
{{dep.recipe.name}}_{{dep.recipe.version}} {{dep.task_name}}
- {% empty %} -
This task has no dependencies
- {% endfor %} +
+ {% for dep in deps %} +
{{dep.recipe.name}}_{{dep.recipe.version}} {{dep.task_name}}
+ {% empty %} +
This task has no dependencies
+ {% endfor %}

- + Reverse dependencies

-
- {% for dep in rdeps %} -
{{dep.recipe.name}}_{{dep.recipe.version}} {{dep.task_name}}
- {% empty %} -
This task has no reverse dependencies
- {% endfor %} +
+ {% for dep in rdeps %} +
{{dep.recipe.name}}_{{dep.recipe.version}} {{dep.task_name}}
+ {% empty %} +
This task has no reverse dependencies
+ {% endfor %}

@@ -245,28 +302,36 @@
{% if task.elapsed_time %}
- + Time (secs)

{{task.elapsed_time|format_none_and_zero|floatformat:2}}
{% endif %} {% if task.cpu_time_user > 0 %}
- + User CPU time (secs)

{{task.cpu_time_user|format_none_and_zero|floatformat:2}}
{% endif %} {% if task.cpu_time_system > 0 %}
- + System CPU time (secs)

{{task.cpu_time_system|format_none_and_zero|floatformat:2}}
{% endif %} {% if task.disk_io > 0 %}
- + Disk I/O (bytes)

{{task.disk_io|format_none_and_zero|intcomma}}
diff --git a/lib/toaster/toastergui/templates/unavailable_artifact.html b/lib/toaster/toastergui/templates/unavailable_artifact.html index 331a4845ab8..fc77e405f7f 100644 --- a/lib/toaster/toastergui/templates/unavailable_artifact.html +++ b/lib/toaster/toastergui/templates/unavailable_artifact.html @@ -6,10 +6,12 @@ {% block title %} Build artifact does not exist - Toaster {% endblock %} {% block pagecontent %} -
-
-
The build artifact you are trying to download does not exist.
-
Back to previous page
+
+
+
+
The build artifact you are trying to download does not exist.
+
Back to previous page
+

{% endblock %} diff --git a/lib/toaster/toastergui/templatetags/projecttags.py b/lib/toaster/toastergui/templatetags/projecttags.py index 119311db93a..dc75f229bbd 100644 --- a/lib/toaster/toastergui/templatetags/projecttags.py +++ b/lib/toaster/toastergui/templatetags/projecttags.py @@ -112,11 +112,11 @@ def task_color(task_object, show_green=False): show_green argument should be True to get green color. """ if not task_object.task_executed: - return 'class=muted' + return 'class=text-muted' elif task_object.outcome == task_object.OUTCOME_FAILED: - return 'class=error' + return 'class=text-danger' elif task_object.outcome == task_object.OUTCOME_SUCCESS and show_green: - return 'class=green' + return 'class=text-success' else: return '' @@ -250,15 +250,15 @@ from django.utils.safestring import mark_safe @register.filter def format_vpackage_rowclass(size): if size == -1: - return mark_safe('class="muted"') + return mark_safe('class="text-muted"') return '' @register.filter def format_vpackage_namehelp(name): r = name + ' ' - r += '' + r += '' return mark_safe(r) @register.filter diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index d58aff0a1b8..9121ea90fd5 100755 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -898,7 +898,6 @@ def configvars(request, build_id): }, {'name': 'Value', 'qhelp': "The value assigned to the variable", - 'dclass': "span4", }, {'name': 'Set in file', 'qhelp': "The last configuration file that touched the variable value",

{{lv.layer.name}}	{{lv.branch}}	{{lv.commit\|truncatechars:13}}
{{variable.variable_name}}	{{variable.variable_value\|truncatechars:153}}	+	{{variable.variable_value\|truncatechars:153}}	{% if variable.vhistory.all %} {% for path in variable.vhistory.all\|filter_setin_files:file_filter %} {{path}} {% endfor %} {% endif %} -	{% if variable.description %} {{variable.description}} - + {% endif %}

Configuration

Configuration

Tasks

Tasks

Recipes & Packages

Recipes & Packages

- - {{build.warnings.count}} warning{{build.warnings.count|pluralize}} -

+ + {{build.warnings.count}} warning{{build.warnings.count|pluralize}} +

Configuration

{{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}}

- +

+ + {{build.errors.count}} error{{build.errors.count|pluralize}} -

Images

{{target.target}} -

{{target.target}}

Other artifacts

Layers

About {{recipe.name}}

No {{search_what}} found

{{target.target}}

{{package.fullpackagespec}}

{{object.name}}_{{object.version}}

{{recipe.name}}_{{recipe.version}}

About {{recipe.name}}

{% if request.GET.search and objects.paginator.count > 0 %} {{objects.paginator.count}} package{{objects.paginator.count|pluralize}} found @@ -30,16 +30,16 @@

{{task.recipe.name}}_{{task.recipe.version}} {{task.task_name}}

{{task.get_outcome_display}} - +

Prebuilt task could be based on - +

Executed - + {% else %} -

+

Not Executed - + {% endif %}

{{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}}

- +

+ + {{build.errors.count}} error{{build.errors.count|pluralize}} -

Images

{{target.target}} -

{{target.target}}

Other artifacts

Configuration

Configuration

Tasks

Tasks

Recipes & Packages

Recipes & Packages

- - {{build.warnings.count}} warning{{build.warnings.count|pluralize}} -

+ + {{build.warnings.count}} warning{{build.warnings.count|pluralize}} +

Configuration

Layers

About {{recipe.name}}

No {{search_what}} found

No {{search_what}} found

{{target.target}}

Filter {{total_count}} {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} matching '{{search_term}}' by '{{tc.name}}'

Filter {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} by '{{tc.name}}'

Filter {{total_count}} {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} matching '{{search_term}}' by '{{tc.name}}'

Filter {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} by '{{tc.name}}'

{{package.fullpackagespec}}

{{object.name}}_{{object.version}}

{{recipe.name}}_{{recipe.version}}

About {{recipe.name}}

{% if request.GET.search and objects.paginator.count > 0 %} {{objects.paginator.count}} package{{objects.paginator.count|pluralize}} found @@ -30,16 +30,16 @@

{{task.recipe.name}}_{{task.recipe.version}} {{task.task_name}}

{{task.get_outcome_display}} - +

Prebuilt task could be based on - +

Executed - + {% else %} -

+

Not Executed - + {% endif %}