diff options
author | David Reyna <David.Reyna@windriver.com> | 2014-02-14 14:58:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-09 12:23:58 -0700 |
commit | 438578e2997f718f4ab2f50f309364edb6e3b4f8 (patch) | |
tree | 11c0c21949ec5ea80cc0fa42289c502c657d6ebb /bitbake/lib/toaster/toastergui/templates | |
parent | 93aa4aba74843aff06434d03c4003a86439678c2 (diff) | |
download | poky-438578e2997f718f4ab2f50f309364edb6e3b4f8.tar.gz |
bitbake: toaster: extend Tasks to include Time, Disk IO, and CPU Usage
Update the All Tasks page to also cover the Time, Disk I/O, and
CPU Usage pages. Add filter count header support, and fix minor column
enablements.
[YOCTO #4387]
(Bitbake rev: 7e78836ebbddf0240094fd79a18cb057d6c4f322)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
3 files changed, 50 insertions, 49 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index 9a8bacb384..fe534618d1 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html | |||
@@ -31,7 +31,7 @@ | |||
31 | <div class="navbar-inner"> | 31 | <div class="navbar-inner"> |
32 | <form class="navbar-search input-append pull-left" id="searchform"> | 32 | <form class="navbar-search input-append pull-left" id="searchform"> |
33 | <div class="input-append" style="padding-right:1em"> | 33 | <div class="input-append" style="padding-right:1em"> |
34 | <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {{objectname}}" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on"><i class="icon-remove"></i></a>{%endif%} | 34 | <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {%if object_search_display %}{{object_search_display}}{%else%}{{objectname}}{%endif%}" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on"><i class="icon-remove"></i></a>{%endif%} |
35 | </div> | 35 | </div> |
36 | <input type="hidden" name="orderby" value="{{request.GET.orderby}}"> | 36 | <input type="hidden" name="orderby" value="{{request.GET.orderby}}"> |
37 | <input type="hidden" name="page" value="1"> | 37 | <input type="hidden" name="page" value="1"> |
diff --git a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html index 4626ffecae..2a23c27d44 100644 --- a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html +++ b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html | |||
@@ -4,12 +4,12 @@ | |||
4 | <input type="hidden" name="search" value="{{request.GET.search}}"/> | 4 | <input type="hidden" name="search" value="{{request.GET.search}}"/> |
5 | <div class="modal-header"> | 5 | <div class="modal-header"> |
6 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> | 6 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> |
7 | <h3>Filter {{objectname|title}} by '{{tc.name}}'</h3> | 7 | <h3>Filter {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} by '{{tc.name}}'</h3> |
8 | </div> | 8 | </div> |
9 | <div class="modal-body"> | 9 | <div class="modal-body"> |
10 | <p>{{f.label}}</p> | 10 | <p>{{f.label}}</p> |
11 | <label class="radio"> | 11 | <label class="radio"> |
12 | <input type="radio" name="filter" {%if request.GET.filter%}{{f.options|check_filter_status:request.GET.filter}} {%else%} checked {%endif%} value=""> All {{objectname}} | 12 | <input type="radio" name="filter" {%if request.GET.filter%}{{f.options|check_filter_status:request.GET.filter}} {%else%} checked {%endif%} value=""> All {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} |
13 | </label> | 13 | </label> |
14 | {% for option in f.options %} | 14 | {% for option in f.options %} |
15 | <label class="radio"> | 15 | <label class="radio"> |
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index 3479e7e1e7..7dc2c38b18 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html | |||
@@ -1,60 +1,61 @@ | |||
1 | {% extends "basebuildpage.html" %} | 1 | {% extends "basebuildpage.html" %} |
2 | {% load projecttags %} | 2 | {% load projecttags %} |
3 | {% block localbreadcrumb %} | 3 | {% block localbreadcrumb %} |
4 | <li>All tasks</li> | 4 | <li>{{title}}</li> |
5 | {% endblock %} | 5 | {% endblock %} |
6 | 6 | ||
7 | {% block buildinfomain %} | 7 | {% block buildinfomain %} |
8 | <div class="span10"> | 8 | <div class="span10"> |
9 | <div class="page-header"> | 9 | <div class="page-header"> |
10 | <h1> Tasks </h1> | 10 | <h1> |
11 | {% if request.GET.filter or request.GET.search and objects.count > 0 %} | ||
12 | {{objects.paginator.count}} task{{objects.paginator.count|pluralize}} found | ||
13 | {%elif objects.paginator.count == 0%} | ||
14 | No tasks | ||
15 | {%else%} | ||
16 | {{title}} | ||
17 | {%endif%} | ||
18 | </h1> | ||
11 | </div> | 19 | </div> |
12 | {% include "basetable_top.html" %} | 20 | {% include "basetable_top.html" %} |
13 | 21 | ||
14 | 22 | {% for task in objects %} | |
15 | {% if not objects %} | 23 | <tr {{ task|task_color }} > |
16 | <p>No tasks were executed in this build!</p> | 24 | <td class="order"> |
17 | {% else %} | 25 | <a href="{%url "task" build.pk task.pk%} ">{{task.order}}</a> |
18 | {% for task in objects %} | 26 | </td> |
19 | <tr {{ task|task_color }} > | 27 | <td class="recipe_name" > |
20 | <td class="order"> | 28 | <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.name}}</a> |
21 | <a href="{%url "task" build.pk task.pk%} ">{{task.order}}</a> | 29 | </td> |
22 | </td> | 30 | <td class="recipe_version"> |
23 | <td class="recipe_name" > | 31 | <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a> |
24 | <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.name}}</a> | 32 | </td> |
25 | </td> | 33 | <td class="task_name"> |
26 | <td class="recipe_version"> | 34 | <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> |
27 | <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a> | 35 | </td> |
28 | </td> | 36 | <td class="executed"> |
29 | <td class="task_name"> | 37 | <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> |
30 | <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> | 38 | </td> |
31 | </td> | 39 | <td class="outcome"> |
32 | <td class="executed"> | 40 | <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a> |
33 | <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> | 41 | </td> |
34 | </td> | 42 | <td class="cache_attempt"> |
35 | <td class="outcome"> | 43 | <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a> |
36 | <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a> | 44 | </td> |
37 | </td> | 45 | <td class="time_taken"> |
38 | <td class="cache_attempt"> | 46 | {{task.elapsed_time|format_none_and_zero|floatformat:2}} |
39 | <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a> | 47 | </td> |
40 | </td> | 48 | <td class="cpu_used"> |
41 | <td class="time_taken"> | 49 | {{task.cpu_usage|format_none_and_zero|floatformat:2}}{% if task.cpu_usage %}%{% endif %} |
42 | {{task.elapsed_time|format_none_and_zero}} | 50 | </td> |
43 | </td> | 51 | <td class="disk_io"> |
44 | <td class="cpu_used"> | 52 | {{task.disk_io|format_none_and_zero}} |
45 | {{task.cpu_usage|format_none_and_zero}} | 53 | </td> |
46 | </td> | 54 | <td class="task_log"> |
47 | <td class="disk_io"> | 55 | {{task.logfile}} |
48 | {{task.disk_io|format_none_and_zero}} | 56 | </td> |
49 | </td> | 57 | </tr> |
50 | <td class="task_log"> | 58 | {% endfor %} |
51 | {{task.logfile}} | ||
52 | </td> | ||
53 | </tr> | ||
54 | |||
55 | {% endfor %} | ||
56 | |||
57 | {% endif %} | ||
58 | 59 | ||
59 | {% include "basetable_bottom.html" %} | 60 | {% include "basetable_bottom.html" %} |
60 | </div> | 61 | </div> |