diff options
| author |   Elliot Smith <elliot.smith@intel.com> | 2015-10-02 18:03:55 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-16 14:59:41 +0100 |
| commit | c781d6be94a25f942946d3a406e07791385e4596 (patch) | |
| tree | cbad9d422ad9ca77246b2afcd77b20fa5b4b6c76 | |
| parent | a31710db562a91da8ef37f5cd2231132474f46da (diff) | |
| download | bitbake-c781d6be94a25f942946d3a406e07791385e4596.tar.gz | |
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.
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>
| -rw-r--r-- | lib/toaster/toastergui/templates/builds.html | 5 | ||||
| -rw-r--r-- | lib/toaster/toastergui/templates/mrb_section.html | 21 |
2 files changed, 10 insertions, 16 deletions
diff --git a/lib/toaster/toastergui/templates/builds.html b/lib/toaster/toastergui/templates/builds.html index 566c279dd..459fcb074 100644 --- a/lib/toaster/toastergui/templates/builds.html +++ b/lib/toaster/toastergui/templates/builds.html @@ -29,8 +29,6 @@ {% include "mrb_section.html" %} - - {% if 1 %} <div class="page-header top-air"> <h1> {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %} @@ -57,8 +55,6 @@ </form> </div> </div> - - {% else %} {% include "basetable_top.html" %} <!-- 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 @@ {% include "basetable_bottom.html" %} {% endif %} {# objects.paginator.count #} -{% endif %} {# empty #} </div><!-- end row-fluid--> {% endblock %} diff --git a/lib/toaster/toastergui/templates/mrb_section.html b/lib/toaster/toastergui/templates/mrb_section.html index 55687a16e..bd8f99178 100644 --- a/lib/toaster/toastergui/templates/mrb_section.html +++ b/lib/toaster/toastergui/templates/mrb_section.html @@ -22,19 +22,18 @@ {% endif %} <div id="latest-builds"> {% for build in mru %} - <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"> - <span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}"> - <a href={% project_url build.project %}> - {{build.project.name}} - </a> - </span> - {% endif %} + <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 %}"> + {% if mrb_type != 'project' %} + <span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}"> + <a href={% project_url build.project %}> + {{build.project.name}} + </a> + </span> + {% endif %} <div class="row-fluid"> - <div class="span3 lead"> + <div class="span3 lead"> {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}"> + <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}"> {% endif %} {% if build.target_set.all.count > 0 %} <span data-toggle="tooltip" |