Skip to content

Commit

Permalink
toaster: Clean up template code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
townxelliot authored and rpurdie committed Oct 16, 2015
1 parent a31710d commit c781d6b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
5 changes: 0 additions & 5 deletions lib/toaster/toastergui/templates/builds.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -57,8 +55,6 @@ <h1>
</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 -->
Expand Down Expand Up @@ -117,7 +113,6 @@ <h1>

{% include "basetable_bottom.html" %}
{% endif %} {# objects.paginator.count #}
{% endif %} {# empty #}
</div><!-- end row-fluid-->

{% endblock %}
21 changes: 10 additions & 11 deletions lib/toaster/toastergui/templates/mrb_section.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,18 @@ <h1>
{% 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"
Expand Down

0 comments on commit c781d6b

Please sign in to comment.