diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2014-04-01 00:39:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-05 14:55:29 +0100 |
commit | 9e81244b8a303489abee6970da00f2ee9d4e637b (patch) | |
tree | c1800ea0aaeb371a268f692c2734780a42ab45c4 /bitbake | |
parent | 4707c7c3eebdb15d5560af6c2e6cee68f85e0a5f (diff) | |
download | poky-9e81244b8a303489abee6970da00f2ee9d4e637b.tar.gz |
bitbake: toaster: Fix "Recent builds" links
* Link the number of errors to the #errors section in the
build dashboard
* Link the number of warnigns to the #warnings section in
the build dashboard
* Link the build time to the build time page
* Move some javascript that applies only to builddashboard.html
to that template from main.js
(Bitbake rev: 94c61d0d9ff24e0c781ea0a8e4bfea4c4ac94d4e)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/build.html | 6 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/builddashboard.html | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/build.html b/bitbake/lib/toaster/toastergui/templates/build.html index afa390fc17..faabd22f8b 100644 --- a/bitbake/lib/toaster/toastergui/templates/build.html +++ b/bitbake/lib/toaster/toastergui/templates/build.html | |||
@@ -48,16 +48,16 @@ | |||
48 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | 48 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} |
49 | <div class="span2 lead"> | 49 | <div class="span2 lead"> |
50 | {% if build.errors_no %} | 50 | {% if build.errors_no %} |
51 | <i class="icon-minus-sign red"></i> <a href="{%url 'builddashboard' build.pk%}" class="error">{{build.errors_no}} error{{build.errors_no|pluralize}}</a> | 51 | <i class="icon-minus-sign red"></i> <a href="{%url 'builddashboard' build.pk%}#errors" class="error">{{build.errors_no}} error{{build.errors_no|pluralize}}</a> |
52 | {% endif %} | 52 | {% endif %} |
53 | </div> | 53 | </div> |
54 | <div class="span2 lead"> | 54 | <div class="span2 lead"> |
55 | {% if build.warnings_no %} | 55 | {% if build.warnings_no %} |
56 | <i class="icon-warning-sign yellow"></i> <a href="{%url 'builddashboard' build.pk%}" class="warning">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a> | 56 | <i class="icon-warning-sign yellow"></i> <a href="{%url 'builddashboard' build.pk%}#warnings" class="warning">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a> |
57 | {% endif %} | 57 | {% endif %} |
58 | </div> | 58 | </div> |
59 | <div class="lead pull-right"> | 59 | <div class="lead pull-right"> |
60 | Build time: <a href="build-time.html">{{ build.timespent|sectohms }}</a> | 60 | Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent|sectohms }}</a> |
61 | </div> | 61 | </div> |
62 | {%endif%}{%if build.outcome == build.IN_PROGRESS %} | 62 | {%endif%}{%if build.outcome == build.IN_PROGRESS %} |
63 | <div class="span4"> | 63 | <div class="span4"> |
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index 6cce7883ba..cc92af5c5a 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html | |||
@@ -186,4 +186,13 @@ | |||
186 | </div> | 186 | </div> |
187 | {% endif %} | 187 | {% endif %} |
188 | 188 | ||
189 | <script type="text/javascript"> | ||
190 | $(document).ready(function() { | ||
191 | //show warnings section when requested from the previous page | ||
192 | if (location.href.search('#warnings') > -1) { | ||
193 | $('#collapse-warnings').addClass('in'); | ||
194 | } | ||
195 | }); | ||
196 | </script> | ||
197 | |||
189 | {% endblock %} | 198 | {% endblock %} |