Variety of fixes all over the place

Makes buildbot more usable, but still tweaks are needed.
This commit is contained in:
2015-06-20 21:15:24 +02:00
parent 96b04687a2
commit c4b9358874
8 changed files with 314 additions and 58 deletions

View File

@@ -5,7 +5,7 @@
{% block content %}
<div class="container">
<h1>
<h1 style="white-space: nowrap;">
Builder <a href="{{ path_to_builder }}">{{ b.getBuilder().getName() }}</a>
Build #{{ b.getNumber() }}
</h1>
@@ -51,43 +51,42 @@ SourceStamps:
<div class="col-md-4">
<div class="box">
<h3>{{ ss.codebase }}</h3>
<table class="table table-striped table-hover box">
{% set ss_class = cycler('alt','') %}
{% if ss.project %}
<tr class="{{ ss_class.next() }}"><td class="left">Project</td><td>{{ ss.project|projectlink }}</td></tr>
<tr class="{{ ss_class.next() }}"><td>Project</td><td>{{ ss.project|projectlink }}</td></tr>
{% endif %}
{% if ss.repository %}
<tr class="{{ ss_class.next() }}"><td class="left">Repository</td><td>{{ ss.repository|repolink }}</td></tr>
<tr class="{{ ss_class.next() }}"><td>Repository</td><td>{{ ss.repository|repolink }}</td></tr>
{% endif %}
{% if ss.branch %}
<tr class="{{ ss_class.next() }}"><td class="left">Branch</td><td>{{ ss.branch|e }}</td></tr>
<tr class="{{ ss_class.next() }}"><td>Branch</td><td>{{ ss.branch|e }}</td></tr>
{% endif %}
{% if ss.revision %}
<tr class="{{ ss_class.next() }}"><td class="left">Revision</td><td>{{ ss.revision|revlink(ss.repository) }}</td></tr>
<tr class="{{ ss_class.next() }}"><td>Revision</td><td>{{ ss.revision|revlink(ss.repository) }}</td></tr>
{% endif %}
{% if got_revisions[ss.codebase] %}
<tr class="{{ ss_class.next() }}"><td class="left">Got Revision</td><td>{{ got_revisions[ss.codebase]|revlink(ss.repository) }}</td></tr>
<tr class="{{ ss_class.next() }}"><td>Got Revision</td><td>{{ got_revisions[ss.codebase]|revlink(ss.repository) }}</td></tr>
{% endif %}
{% if ss.patch %}
<tr class="{{ ss_class.next() }}"><td class="left">Patch</td><td>YES</td></tr>
<tr class="{{ ss_class.next() }}"><td>Patch</td><td>YES</td></tr>
{% endif %}
{% if ss.changes %}
<tr class="{{ ss_class.next() }}"><td class="left">Changes</td><td><a href="#changes-{{ ss.codebase }}">{{ ss.changes|count }} change{{ 's' if ss.changes|count > 1 else '' }}</a></td></tr>
<tr class="{{ ss_class.next() }}"><td>Changes</td><td><a href="#changes-{{ ss.codebase }}">{{ ss.changes|count }} change{{ 's' if ss.changes|count > 1 else '' }}</a></td></tr>
{% endif %}
{% if not ss.branch and not ss.revision and not ss.patch and not ss.changes %}
<tr class="{{ ss_class.next() }}"><td class="left" colspan="2">Build of most recent revision</td></tr>
<tr class="{{ ss_class.next() }}"><td colspan="2" align="center">Build of most recent revision</td></tr>
{% endif %}
</table>
</div></div>
</div></div>
{% endfor %}
</div>
{% endfor %}
@@ -121,27 +120,28 @@ SourceStamps:
# (target, ex_url_class, html.escape(name)))
#}
{# TODO(sergey): Move hardcoded span with inline-block into a CSS class. #}
<ol>
{% for s in steps %}
<li>
<div class="{{ s.css_class }} result">
<a href="{{ s.link }}">{{ s.name }}</a>
<span class="pull-right label label-info">{{ s.text }} &nbsp;
{{ '( ' + s.time_to_run + ' )' if s.time_to_run else '' }}</span>
</div>
<span style="display: inline-block; width: 40%;"><a href="{{ s.link }}">{{ s.name }}</a></span>
<span style="display: inline-block; width: 25%;">
<span class="label label-info">{{ s.text }} &nbsp; {{ '( ' + s.time_to_run + ' )' if s.time_to_run else '' }}</span>
</span>
<span style="display: inline-block; width: 30%; padding-left: 12pt;">
<ol>
{% set item_class = cycler('alt', '') %}
{% for l in s.logs %}
<li class="{{ item_class.next() }}"><a class="btn btn-default" href="{{ l.link }}">{{ l.name }}</a></li>
<a class="btn btn-default" href="{{ l.link }}">{{ l.name }}</a>
{% else %}
<li class="{{ item_class.next() }}"><a class="btn btn-default disabled" href="#" >- no logs -</a></li>
<a class="btn btn-default disabled" href="#" >- no logs -</a>
{% endfor %}
{% for u in s.urls %}
<li class="{{ item_class.next() }}"><a class="btn btn-default" href="{{ u.url }}">{{ u.logname }}</a></li>
<a class="btn btn-default" href="{{ u.url }}">{{ u.logname }}</a>
{% endfor %}
</ol>
</ol>
</span>
</li>
{% endfor %}
</ol>
@@ -151,13 +151,13 @@ SourceStamps:
<h2>Build Properties:</h2>
<table class="table">
<table class="table table-striped table-hover box">
<tr><th>Name</th><th>Value</th><th>Source</th></tr>
{% for p in properties %}
{% if p.source != "Force Build Form" %}
<tr class="{{ loop.cycle('alt', '') }}">
<td class="left">{{ p.name|e }}</td>
<td>{{ p.name|e }}</td>
{% if p.short_value %}
<td>{{ p.short_value|e }} .. [property value too long]</td>
{% else %}
@@ -165,7 +165,7 @@ SourceStamps:
<td>{{ p.value|e }}</td>
{% else %}
<td>
<table class="table">
<table class="table table-striped table-hove">
{%- for key, value in p.value.items() recursive %}
<tr><td>{{ key|e }}</td><td>{{ value|e }}</td></tr>
{% endfor %}
@@ -179,14 +179,14 @@ SourceStamps:
{% endfor %}
</table>
<h2>Forced Build Properties:</h2>
<table class="table">
<table class="table table-striped table-hover box">
<tr><th>Name</th><th>Label</th><th>Value</th></tr>
{% for p in properties %}
{% if p.source == "Force Build Form" %}
<tr class="{{ loop.cycle('alt', '') }}">
<td class="left">{{ p.name|e }}</td>
<td class="left">
<td>{{ p.name|e }}</td>
<td>
{% if p.label %}
{{ p.label }}
{% endif %}
@@ -215,12 +215,12 @@ SourceStamps:
<h2>Timing:</h2>
<table class="table">
<tr class="alt"><td class="left">Start</td><td>{{ start }}</td></tr>
<table class="table table-striped table-hover box">
<tr class="alt"><td>Start</td><td>{{ start }}</td></tr>
{% if end %}
<tr><td class="left">End</td><td>{{ end }}</td></tr>
<tr><td>End</td><td>{{ end }}</td></tr>
{% endif %}
<tr {{ 'class="alt"' if end else '' }}><td class="left">Elapsed</td><td>{{ elapsed }}</td></tr>
<tr {{ 'class="alt"' if end else '' }}><td>Elapsed</td><td>{{ elapsed }}</td></tr>
</table>
{% if authz.advertiseAction('forceBuild', request) %}