diff options
author | Elliot Smith <elliot.smith@intel.com> | 2015-09-30 14:53:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-16 14:59:59 +0100 |
commit | ef6fc2bc1a4eeafdf5eda112ffb72bfed24b85d5 (patch) | |
tree | b68bc4a1d3253a2db1dbb8c15bfd3030ab74894d /bitbake/lib/toaster/toastergui/templates | |
parent | 7467b6802d64e12710510d8e4653da15d12d7089 (diff) | |
download | poky-ef6fc2bc1a4eeafdf5eda112ffb72bfed24b85d5.tar.gz |
bitbake: toaster: Replace "Run again" button with help text for cli builds
It's not possible to run a command-line build again, as Toaster
doesn't have access to the data used for that build.
Replace the "Run again" button with an icon which pops up some
help text to that effect.
Add test to check that the run again button is hidden and the
help icon displayed instead for command-line builds.
[YOCTO #8231]
(Bitbake rev: b67ac9e7cbab50951847dd1a63b12f41bb345dbb)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/mrb_section.html | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index ad90e82ee3..5e96b39121 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html | |||
@@ -18,7 +18,7 @@ | |||
18 | {% endif %} | 18 | {% endif %} |
19 | <div id="latest-builds"> | 19 | <div id="latest-builds"> |
20 | {% for build in mru %} | 20 | {% for build in mru %} |
21 | <div class="alert {%if build.outcome == build.SUCCEEDED%}alert-success{%elif build.outcome == build.FAILED%}alert-error{%else%}alert-info{%endif%} | 21 | <div id="build-result-{{ build.id }}" class="alert build-result {%if build.outcome == build.SUCCEEDED%}alert-success{%elif build.outcome == build.FAILED%}alert-error{%else%}alert-info{%endif%} |
22 | {% if mrb_type != 'project' %} | 22 | {% if mrb_type != 'project' %} |
23 | project-name"> | 23 | project-name"> |
24 | <span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}"> | 24 | <span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}"> |
@@ -81,24 +81,37 @@ | |||
81 | </div> | 81 | </div> |
82 | <div class="lead "> | 82 | <div class="lead "> |
83 | <span class="lead"> | 83 | <span class="lead"> |
84 | Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> | 84 | Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> |
85 | </span> | 85 | </span> |
86 | <button class="btn | 86 | {% if build.project.is_default %} |
87 | <i class="pull-right icon-question-sign get-help | ||
87 | {% if build.outcome == build.SUCCEEDED %} | 88 | {% if build.outcome == build.SUCCEEDED %} |
88 | btn-success | 89 | get-help-green |
89 | {% elif build.outcome == build.FAILED %} | 90 | {% elif build.outcome == build.FAILED %} |
90 | btn-danger | 91 | get-help-red |
91 | {% else %} | 92 | {% else %} |
92 | btn-info | 93 | get-help-blue |
93 | {%endif%} | 94 | {% endif %} |
94 | pull-right" | 95 | " title="Builds in this project cannot be started from Toaster: they are started from the command line"> |
95 | onclick='scheduleBuild({% url 'projectbuilds' build.project.id as bpi %}{{bpi|json}}, | 96 | </i> |
96 | {{build.project.name|json}}, | 97 | {% else %} |
97 | {% url 'project' build.project.id as bpurl %}{{bpurl|json}}, | 98 | <button class="btn |
98 | {{build.target_set.all|get_tasks|json}})'> | 99 | {% if build.outcome == build.SUCCEEDED %} |
100 | btn-success | ||
101 | {% elif build.outcome == build.FAILED %} | ||
102 | btn-danger | ||
103 | {% else %} | ||
104 | btn-info | ||
105 | {%endif%} | ||
106 | pull-right" | ||
107 | onclick='scheduleBuild({% url 'projectbuilds' build.project.id as bpi %}{{bpi|json}}, | ||
108 | {{build.project.name|json}}, | ||
109 | {% url 'project' build.project.id as bpurl %}{{bpurl|json}}, | ||
110 | {{build.target_set.all|get_tasks|json}})'> | ||
99 | 111 | ||
100 | Run again | 112 | Run again |
101 | </button> | 113 | </button> |
114 | {% endif %} | ||
102 | </div> | 115 | </div> |
103 | {%endif%} | 116 | {%endif%} |
104 | {%if build.outcome == build.IN_PROGRESS %} | 117 | {%if build.outcome == build.IN_PROGRESS %} |