summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2014-02-20 08:13:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-17 13:59:38 +0000
commitb2e5cab1b5798adea3bf5716492ccc7637dad6b3 (patch)
tree0a71ee23e4db1f5d95643e9337c4c0941b8ce337 /bitbake/lib/toaster
parentd24584f89680849f2cce83cc794b319d73dd554f (diff)
downloadpoky-b2e5cab1b5798adea3bf5716492ccc7637dad6b3.tar.gz
bitbake: toaster: Not using task_color tag for execution heading
The modifications to the task_color tag in commit 23a7c338d387ac2ba13a7a1114a4abc75228c960 broke the styling of failed tasks in the tasks.html template. Undo the changes to the task_color tag and use an if statement instead to set the .muted class when the execution heading says "Not executed". (Bitbake rev: e3b3205674f606b927f1bf568202a592ca6453c9) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/task.html9
-rw-r--r--bitbake/lib/toaster/toastergui/templatetags/projecttags.py6
2 files changed, 8 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
index af994fde1b..7c5b7435ff 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/bitbake/lib/toaster/toastergui/templates/task.html
@@ -131,15 +131,16 @@
131{% endif %} 131{% endif %}
132 132
133{# Execution section #} 133{# Execution section #}
134<h2 {{task|task_color}}>
135 {% if task.task_executed %} 134 {% if task.task_executed %}
135 <h2>
136 Executed 136 Executed
137 <i class="icon-question-sign get-help heading-help" title="Executed tasks are those that need to run in order to generate the task output"></i> 137 <i class="icon-question-sign get-help heading-help" title="Executed tasks are those that need to run in order to generate the task output"></i>
138 {% else %} 138 {% else %}
139 <h2 class="muted">
139 Not Executed 140 Not Executed
140 <i class="icon-question-sign get-help heading-help" title="Not executed tasks don't need to run because their outcome is provided by another task"></i> 141 <i class="icon-question-sign get-help heading-help" title="Not executed tasks don't need to run because their outcome is provided by another task"></i>
141 {% endif %} 142 {% endif %}
142</h2> 143 </h2>
143<dl class="dl-horizontal"> 144<dl class="dl-horizontal">
144 <dt> 145 <dt>
145 <i class="icon-question-sign get-help" title="To make builds more efficient, the build system detects changes in the 'inputs' to a given task by creating a 'task signature'. If the signature changes, the build system assumes the inputs have changed and the task needs to be rerun"></i> 146 <i class="icon-question-sign get-help" title="To make builds more efficient, the build system detects changes in the 'inputs' to a given task by creating a 'task signature'. If the signature changes, the build system assumes the inputs have changed and the task needs to be rerun"></i>
diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
index 2d339d623f..857680b350 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
@@ -70,16 +70,16 @@ def sortcols(tablecols):
70 return sorted(tablecols, key = lambda t: t['name']) 70 return sorted(tablecols, key = lambda t: t['name'])
71 71
72@register.filter 72@register.filter
73def task_color(task_object, show_colour=False): 73def task_color(task_object, show_green=False):
74 """ Return css class depending on Task execution status and execution outcome. 74 """ Return css class depending on Task execution status and execution outcome.
75 By default, green is not returned for executed and successful tasks; 75 By default, green is not returned for executed and successful tasks;
76 show_green argument should be True to get green color. 76 show_green argument should be True to get green color.
77 """ 77 """
78 if not task_object.task_executed: 78 if not task_object.task_executed:
79 return 'class=muted' 79 return 'class=muted'
80 elif task_object.outcome == task_object.OUTCOME_FAILED and show_colour: 80 elif task_object.outcome == task_object.OUTCOME_FAILED:
81 return 'class=error' 81 return 'class=error'
82 elif task_object.outcome == task_object.OUTCOME_SUCCESS and show_colour: 82 elif task_object.outcome == task_object.OUTCOME_SUCCESS and show_green:
83 return 'class=green' 83 return 'class=green'
84 else: 84 else:
85 return '' 85 return ''