From 64ba1fa80518cab3fba8d4dd418ebd0e79ebb6d1 Mon Sep 17 00:00:00 2001
From: Belen Barros Pena <belen.barros.pena@intel.com>
Date: Sat, 15 Mar 2014 17:04:50 +0000
Subject: bitbake: toaster: Small fixes in tasks UI

This commit:

* Fixes an issue with white space when showing the log
in Cached tasks (task details page)

* Formats the no results alert of the "Prebuilt task
could be based on" search in the task details page

* Brings in the task outcome help text to "Prebuilt
task could be based on" table in the task details page,
to the tasks table in the recipe details page, and to
the all tasks page

* Adds the task_color tag to the "Prebuilt task could
be based on" table in the task details page, so that
each task gets the required visual treatment based on
execution

* Makes sure performance information for not executed
tasks shows in the task details page when it exists
(empty tasks often report a short time, for example)

(Bitbake rev: ff46fd6d8db52eeabe8c938c347ce5ba8d328cc1)

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/lib/toaster/toastergui/templates/recipe.html |  6 ++++--
 bitbake/lib/toaster/toastergui/templates/task.html   | 18 ++++++++----------
 bitbake/lib/toaster/toastergui/templates/tasks.html  |  3 ++-
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'bitbake')

diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html
index 716ddfac96..e367077a01 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe.html
@@ -117,11 +117,13 @@
 
                     <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_executed_display}}</a></td>
 
-                    <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}}</a></td>
+                    <td>
+                        <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}} </a>
+                        <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i>
+                    </td>
                     <td>
                         {% ifnotequal task.sstate_result task.SSTATE_NA %}
                         <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_sstate_result_display}}</a>
-                        <i class="icon-question-sign get-help hover-help" title="This task did not run because its outcome was reused from a previous build"></i>
                         {% endifnotequal %}
                     </td>
 
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
index 7c5b7435ff..1a7e9d4c04 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/bitbake/lib/toaster/toastergui/templates/task.html
@@ -76,7 +76,7 @@
                 </thead>
                 <tbody>
                     {% for match in matching_tasks %}
-                        <tr>
+                        <tr {{ match|task_color }}>
                             <td>
                                 <a href="{%url "task" match.build.pk match.pk%}">{{match.recipe.name}}</a>
                             </td>
@@ -87,7 +87,7 @@
                                 <a href="{%url "task" match.build.pk match.pk%}">{{match.get_executed_display}}</a>
                             </td>
                             <td>
-                                <a href="{%url "task" match.build.pk match.pk%}">{{match.get_outcome_display}}</a><i class="icon-question-sign get-help hover-help" title="{{match.outcome_help}}"></i>
+                                <a href="{%url "task" match.build.pk match.pk%}">{{match.get_outcome_display}} </a><i class="icon-question-sign get-help hover-help" title="{{match.get_outcome_help}}"></i>
                             </td>
                             <td>
                                 <a href="{%url "task" match.build.pk match.pk%}">{{match.build.completed_on|date:"d/m/y H:i"}}</a>
@@ -98,8 +98,8 @@
             </table>
         {% else %}
             <p class="alert">
-                We have found no tasks matching this prebuilt task.<br/>
-                The task you are looking for could belong to a build for which Toaster has not data.
+                <strong> We have found no tasks matching this prebuilt task</strong><br/>
+                The task you are looking for could belong to a build for which Toaster has no data.
             </p>
         {% endif %}
     {% elif task.outcome == task.OUTCOME_COVERED %}
@@ -119,8 +119,7 @@
                 <i class="icon-question-sign get-help" title="The location in disk of the task log file"></i> Log file
             </dt>
             <dd>
-                <code>{% for t in task.get_related_setscene %} {{t.logfile}}<br/>{% endfor %}
-		</code>
+                <code>{% for t in task.get_related_setscene %} {{t.logfile}} {% endfor %}</code>
             </dd>
         </dl>
     {%elif task.outcome == task.OUTCOME_EMPTY%}
@@ -243,10 +242,11 @@
 </dl>
 
 {# Performance section - shown only for executed tasks #}
-{%if task.task_executed %}
+{%if task.elapsed_time or task.cpu_usage or task.disk_io %}
     <h2 class="details">Performance</h2>
+{% endif %}
     <dl class="dl-horizontal">
-		{% if task.elapsed_time > 0.01 %}
+		{% if task.elapsed_time %}
         <dt>
             <i class="icon-question-sign get-help" title="How long it took the task to finish, expressed in seconds"></i>
             Time (secs)
@@ -268,8 +268,6 @@
         <dd>{{task.disk_io|format_none_and_zero}}</dd>
 		{% endif %}
     </dl>
-{%endif%}
-
 
 </div>
 {% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
index a2629dc1cb..ace30de3eb 100644
--- a/bitbake/lib/toaster/toastergui/templates/tasks.html
+++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
@@ -51,7 +51,8 @@
                 <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a>
             </td>
             <td class="outcome">
-                <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a>
+                <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}} </a>
+                <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i>
             </td>
             <td class="cache_attempt">
                 <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a>
-- 
cgit v1.2.3-54-g00ecf