summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2014-03-15 17:04:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-25 21:32:17 +0000
commit64ba1fa80518cab3fba8d4dd418ebd0e79ebb6d1 (patch)
treec9c516eacee58542a85795461d5c979483ee24f5
parentbca174a63f63b8998d6a07d856f03b9064692a23 (diff)
downloadpoky-64ba1fa80518cab3fba8d4dd418ebd0e79ebb6d1.tar.gz
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>
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipe.html6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/task.html18
-rw-r--r--bitbake/lib/toaster/toastergui/templates/tasks.html3
3 files changed, 14 insertions, 13 deletions
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 @@
117 117
118 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_executed_display}}</a></td> 118 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_executed_display}}</a></td>
119 119
120 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}}</a></td> 120 <td>
121 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}} </a>
122 <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i>
123 </td>
121 <td> 124 <td>
122 {% ifnotequal task.sstate_result task.SSTATE_NA %} 125 {% ifnotequal task.sstate_result task.SSTATE_NA %}
123 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_sstate_result_display}}</a> 126 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_sstate_result_display}}</a>
124 <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>
125 {% endifnotequal %} 127 {% endifnotequal %}
126 </td> 128 </td>
127 129
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 @@
76 </thead> 76 </thead>
77 <tbody> 77 <tbody>
78 {% for match in matching_tasks %} 78 {% for match in matching_tasks %}
79 <tr> 79 <tr {{ match|task_color }}>
80 <td> 80 <td>
81 <a href="{%url "task" match.build.pk match.pk%}">{{match.recipe.name}}</a> 81 <a href="{%url "task" match.build.pk match.pk%}">{{match.recipe.name}}</a>
82 </td> 82 </td>
@@ -87,7 +87,7 @@
87 <a href="{%url "task" match.build.pk match.pk%}">{{match.get_executed_display}}</a> 87 <a href="{%url "task" match.build.pk match.pk%}">{{match.get_executed_display}}</a>
88 </td> 88 </td>
89 <td> 89 <td>
90 <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> 90 <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>
91 </td> 91 </td>
92 <td> 92 <td>
93 <a href="{%url "task" match.build.pk match.pk%}">{{match.build.completed_on|date:"d/m/y H:i"}}</a> 93 <a href="{%url "task" match.build.pk match.pk%}">{{match.build.completed_on|date:"d/m/y H:i"}}</a>
@@ -98,8 +98,8 @@
98 </table> 98 </table>
99 {% else %} 99 {% else %}
100 <p class="alert"> 100 <p class="alert">
101 We have found no tasks matching this prebuilt task.<br/> 101 <strong> We have found no tasks matching this prebuilt task</strong><br/>
102 The task you are looking for could belong to a build for which Toaster has not data. 102 The task you are looking for could belong to a build for which Toaster has no data.
103 </p> 103 </p>
104 {% endif %} 104 {% endif %}
105 {% elif task.outcome == task.OUTCOME_COVERED %} 105 {% elif task.outcome == task.OUTCOME_COVERED %}
@@ -119,8 +119,7 @@
119 <i class="icon-question-sign get-help" title="The location in disk of the task log file"></i> Log file 119 <i class="icon-question-sign get-help" title="The location in disk of the task log file"></i> Log file
120 </dt> 120 </dt>
121 <dd> 121 <dd>
122 <code>{% for t in task.get_related_setscene %} {{t.logfile}}<br/>{% endfor %} 122 <code>{% for t in task.get_related_setscene %} {{t.logfile}} {% endfor %}</code>
123 </code>
124 </dd> 123 </dd>
125 </dl> 124 </dl>
126 {%elif task.outcome == task.OUTCOME_EMPTY%} 125 {%elif task.outcome == task.OUTCOME_EMPTY%}
@@ -243,10 +242,11 @@
243</dl> 242</dl>
244 243
245{# Performance section - shown only for executed tasks #} 244{# Performance section - shown only for executed tasks #}
246{%if task.task_executed %} 245{%if task.elapsed_time or task.cpu_usage or task.disk_io %}
247 <h2 class="details">Performance</h2> 246 <h2 class="details">Performance</h2>
247{% endif %}
248 <dl class="dl-horizontal"> 248 <dl class="dl-horizontal">
249 {% if task.elapsed_time > 0.01 %} 249 {% if task.elapsed_time %}
250 <dt> 250 <dt>
251 <i class="icon-question-sign get-help" title="How long it took the task to finish, expressed in seconds"></i> 251 <i class="icon-question-sign get-help" title="How long it took the task to finish, expressed in seconds"></i>
252 Time (secs) 252 Time (secs)
@@ -268,8 +268,6 @@
268 <dd>{{task.disk_io|format_none_and_zero}}</dd> 268 <dd>{{task.disk_io|format_none_and_zero}}</dd>
269 {% endif %} 269 {% endif %}
270 </dl> 270 </dl>
271{%endif%}
272
273 271
274</div> 272</div>
275{% endblock %} 273{% 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 @@
51 <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> 51 <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a>
52 </td> 52 </td>
53 <td class="outcome"> 53 <td class="outcome">
54 <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a> 54 <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}} </a>
55 <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i>
55 </td> 56 </td>
56 <td class="cache_attempt"> 57 <td class="cache_attempt">
57 <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a> 58 <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a>