mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
bitbake: toaster: Fixes to the build dashboard
* Add "on" before the date in the build status * Get rid of the extra space before the "and" in the build status * Make the errors and warnings links in the build status show the message content * Make sure that the "Images" section in the left navigation appears only for successful builds * Link the number of packages installed to the "Packages included" tab in the image information page * Remove unnecessary inline styles in the dashboard template * Make sure target names in the h1 are listed in alphabetical order (Bitbake rev: 644a38e9a90728af52ebda9846d2037dd6831b41) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Belen Barros Pena
committed by
Richard Purdie
Richard Purdie
parent
37e2670951
commit
9db433246f
@@ -108,6 +108,7 @@ select { width: auto; }
|
||||
.hero-unit { margin: 20px 0 30px; }
|
||||
.hero-unit > .close { font-size:40px; }
|
||||
.hero-actions { margin-top: 30px; }
|
||||
.dashboard-section { background-color: transparent; }
|
||||
|
||||
/* make tables Chrome-happy (me, not so much) */
|
||||
#otable { table-layout: fixed; word-wrap: break-word; }
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<!-- begin left sidebar container -->
|
||||
<div id="nav" class="span2">
|
||||
<ul class="nav nav-list well">
|
||||
{% if build.target_set.all.0.is_image %}
|
||||
{% if build.target_set.all.0.is_image and build.outcome == 0 %}
|
||||
<li class="nav-header">Images</li>
|
||||
{% block nav-target %}
|
||||
{% for t in build.get_sorted_target_list %}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<!-- page title -->
|
||||
<div class="row-fluid span10">
|
||||
<div class="page-header">
|
||||
<h1>{{build.target_set.all|join:", "}} {{build.machine}}</h1>
|
||||
<h1>{{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}}</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<div class="row-fluid lead">
|
||||
<span class="pull-left"><strong>
|
||||
{%if build.outcome == build.SUCCEEDED%}Completed{%elif build.outcome == build.FAILED%}Failed{%else%}{%endif%}
|
||||
</strong>
|
||||
</strong> on
|
||||
{{build.completed_on|date:"d/m/y H:i"}}
|
||||
</span>
|
||||
{% if build.warnings_no or build.errors_no %}
|
||||
@@ -28,13 +28,13 @@
|
||||
{% endif %}
|
||||
{%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}
|
||||
{% if build.errors_no %}
|
||||
<span > <i class="icon-minus-sign red"></i><strong><a href="#errors" class="error"> {{build.errors_no}} error{{build.errors_no|pluralize}}</a></strong></span>
|
||||
<span > <i class="icon-minus-sign red"></i><strong><a href="#errors" class="error show-errors"> {{build.errors_no}} error{{build.errors_no|pluralize}}</a></strong></span>
|
||||
{% endif %}
|
||||
{% if build.warnings_no %}
|
||||
{% if build.errors_no %}
|
||||
and
|
||||
and
|
||||
{% endif %}
|
||||
<span > <i class="icon-warning-sign yellow"></i><strong><a href="#warnings" class="warning"> {{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a></strong></span>
|
||||
<span > <i class="icon-warning-sign yellow"></i><strong><a href="#warnings" class="warning show-warnings"> {{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a></strong></span>
|
||||
{% endif %}
|
||||
<span class="pull-right">Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent|sectohms }}</a></span>
|
||||
{%endif%}
|
||||
@@ -75,27 +75,27 @@
|
||||
<h2>Images</h2>
|
||||
{% for target in targets %}
|
||||
{% if target.target.is_image %}
|
||||
<div class="well" style="background-color:transparent;">
|
||||
<div class="well dashboard-section">
|
||||
<h3><a href="{% url 'target' build.pk target.target.pk %}">{{target.target}}</a>
|
||||
</h3>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>Packages included</dt>
|
||||
<dd><a href="{% url 'packages' build.pk %}">{{target.npkg}}</a></dd>
|
||||
<dd><a href="{% url 'target' build.pk target.target.pk %}">{{target.npkg}}</a></dd>
|
||||
<dt>Total package size</dt>
|
||||
<dd>{{target.pkgsz|filtered_filesizeformat}}</dd>
|
||||
<dt>
|
||||
<i class="icon-question-sign get-help" title="Path to the license manifest, which is a document listing all packages installed in your image and their licenses"></i>
|
||||
License manifest
|
||||
<i class="icon-question-sign get-help" title="The location in disk of the license manifest, a document listing all packages installed in your image and their licenses"></i>
|
||||
<a href="{% url 'target' build.pk target.target.pk %}">License manifest</a>
|
||||
</dt>
|
||||
<dd><a href="{% url 'targetpackages' build.pk target.target.pk %}"><code>{{target.target.license_manifest_path}}</code></a></dd>
|
||||
<dd><code>{{target.target.license_manifest_path}}</code></dd>
|
||||
<dt>
|
||||
<i class="icon-question-sign get-help" title="Image files are stored in <code style='background-color:transparent;color:#FFFFFF;font-weight:normal;border:none;'>/build/tmp/deploy/images/</code>"></i>
|
||||
<i class="icon-question-sign get-help" title="Image files are stored in <code>/build/tmp/deploy/images/</code>"></i>
|
||||
Image files
|
||||
</dt>
|
||||
<dd>
|
||||
<ul>
|
||||
{% for i in target.imageFiles %}
|
||||
<li><strong>{{i.path}}</strong>
|
||||
<li>{{i.path}}
|
||||
({{i.size|filtered_filesizeformat}})</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
@@ -114,7 +114,7 @@
|
||||
<!-- build summary -->
|
||||
<div class="row-fluid span10 pull-right">
|
||||
<h2>Build summary</h2>
|
||||
<div class="well span4" style="margin-left:0px; background-color:transparent;">
|
||||
<div class="well span4 dashboard-section" style="margin-left:0px;">
|
||||
<h4><a href="{%url 'configuration' build.pk%}">Configuration</a></h4>
|
||||
<dl>
|
||||
<dt>Machine</dt><dd>{{build.machine}}</dd>
|
||||
@@ -122,7 +122,7 @@
|
||||
<dt>Layers</dt>{% for i in build.layer_version_build.all|dictsort:"layer.name" %}<dd>{{i.layer.name}}</dd>{%endfor%}
|
||||
</dl>
|
||||
</div>
|
||||
<div class="well span4" style="background-color:transparent;">
|
||||
<div class="well span4 dashboard-section">
|
||||
<h4><a href="{%url 'tasks' build.pk%}">Tasks</a></h4>
|
||||
<dl>
|
||||
<dt>Total number of tasks</dt><dd><a href="{% url 'tasks' build.pk %}">{{build.task_build.all.count}}</a></dd>
|
||||
@@ -151,7 +151,7 @@
|
||||
</dd>
|
||||
</dl>
|
||||
</div>
|
||||
<div class="well span4" style="background-color:transparent;">
|
||||
<div class="well span4 dashboard-section">
|
||||
<h4><a href="{% url 'recipes' build.pk %}">Recipes</a> & <a href="{% url 'packages' build.pk %}">Packages</a></h4>
|
||||
<dl>
|
||||
<dt>Recipes built</dt><dd><a href="{% url 'recipes' build.pk %}">{{recipecount}}</a></dd>
|
||||
|
||||
Reference in New Issue
Block a user