summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2015-10-02 18:03:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-16 14:59:59 +0100
commit56d4c84cec911a9cf44848b0de6e04617fe7d82d (patch)
treede31b106728ef1e5b5317bae9f3c45c817aec554
parentd96cedf51fd106e1f45db2556ad0f87f8cf84436 (diff)
downloadpoky-56d4c84cec911a9cf44848b0de6e04617fe7d82d.tar.gz
bitbake: toaster: Clean up template code
Some errors in the HTML template didn't show up until they were rendering command line builds. One useless conditional was lingering in another template. Clean up these issues to display the latest builds section correctly. (Bitbake rev: c781d6be94a25f942946d3a406e07791385e4596) 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>
-rw-r--r--bitbake/lib/toaster/toastergui/templates/builds.html5
-rw-r--r--bitbake/lib/toaster/toastergui/templates/mrb_section.html21
2 files changed, 10 insertions, 16 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html b/bitbake/lib/toaster/toastergui/templates/builds.html
index 566c279ddd..459fcb0744 100644
--- a/bitbake/lib/toaster/toastergui/templates/builds.html
+++ b/bitbake/lib/toaster/toastergui/templates/builds.html
@@ -29,8 +29,6 @@
29 29
30 {% include "mrb_section.html" %} 30 {% include "mrb_section.html" %}
31 31
32
33 {% if 1 %}
34 <div class="page-header top-air"> 32 <div class="page-header top-air">
35 <h1> 33 <h1>
36 {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %} 34 {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %}
@@ -57,8 +55,6 @@
57 </form> 55 </form>
58 </div> 56 </div>
59 </div> 57 </div>
60
61
62 {% else %} 58 {% else %}
63 {% include "basetable_top.html" %} 59 {% include "basetable_top.html" %}
64 <!-- Table data rows; the order needs to match the order of "tablecols" definitions; and the <td class value needs to match the tablecols clclass value for show/hide buttons to work --> 60 <!-- Table data rows; the order needs to match the order of "tablecols" definitions; and the <td class value needs to match the tablecols clclass value for show/hide buttons to work -->
@@ -117,7 +113,6 @@
117 113
118 {% include "basetable_bottom.html" %} 114 {% include "basetable_bottom.html" %}
119 {% endif %} {# objects.paginator.count #} 115 {% endif %} {# objects.paginator.count #}
120{% endif %} {# empty #}
121</div><!-- end row-fluid--> 116</div><!-- end row-fluid-->
122 117
123{% endblock %} 118{% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
index 55687a16ef..bd8f99178f 100644
--- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html
+++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
@@ -22,19 +22,18 @@
22 {% endif %} 22 {% endif %}
23 <div id="latest-builds"> 23 <div id="latest-builds">
24 {% for build in mru %} 24 {% for build in mru %}
25 <div data-latest-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%} 25 <div data-latest-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%}{% if mrb_type != 'project' %} project-name{% endif %}">
26 {% if mrb_type != 'project' %} 26 {% if mrb_type != 'project' %}
27 project-name"> 27 <span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}">
28 <span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}"> 28 <a href={% project_url build.project %}>
29 <a href={% project_url build.project %}> 29 {{build.project.name}}
30 {{build.project.name}} 30 </a>
31 </a> 31 </span>
32 </span> 32 {% endif %}
33 {% endif %}
34 <div class="row-fluid"> 33 <div class="row-fluid">
35 <div class="span3 lead"> 34 <div class="span3 lead">
36 {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} 35 {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}
37 <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}"> 36 <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}">
38 {% endif %} 37 {% endif %}
39 {% if build.target_set.all.count > 0 %} 38 {% if build.target_set.all.count > 0 %}
40 <span data-toggle="tooltip" 39 <span data-toggle="tooltip"