Skip to content

Commit

Permalink
BUILDBOT: Update template files to be based on 0.8.9.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lordhoto
lordhoto committed Feb 16, 2016
1 parent 819d4a8 commit 0b9164b
Show file tree
Hide file tree
Showing 33 changed files with 883 additions and 612 deletions.
100 changes: 60 additions & 40 deletions templates/about.html
View file
@@ -1,47 +1,67 @@
{% extends "layout.html" %}

{% block content %}
{% block content_td %}
<td class="tableborder">
{% set item_class=cycler('row1', 'row3') %}
<!--[insert table scummvm-style]--><table border="0" cellpadding="2" cellspacing="1" width="100%">
<tbody>
<tr align="center">
<td class="toprow" colspan="3" style="text-align: left; margin-left: 0pt; margin-right: auto;">
<b><span class="toprowtext">About this Buildbot</span></b>
</td>
</tr>
<tr>
<td colspan="3" class="catrow">
<span class="catrowtext">Version Information</span>
</td>
</tr>
<tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">Buildbot: {{ buildbot }}</td>
</tr><tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">Twisted: {{ twisted }}</td>
</tr><tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">Jinja: {{ jinja }}</td>
</tr><tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">Python: {{ python }}</td>
</tr><tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">Buildmaster platform: {{ platform }}</td>
{% endblock %}

</tr>
<tr>
<td colspan="3" class="catrow"><span class="catrowtext">Source code</span><td></tr>
<tr>
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">Buildbot is a free software project, released under the terms of the
<a href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</tr></td>
</tr></td>
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">Please visit the <a href="http://buildbot.net/">Buildbot Home Page</a> for
more information, including documentation, bug reports, and source
downloads.</tr></td>
{% block content %}

<tr>
<td colspan="3" class="catrow">
</td>
</tr>
</tbody>
</table>
{% set item_class=cycler('row1', 'row3') %}
<table border="0" cellpadding="2" cellspacing="1" width="100%">
<tr align="center">
<td class="toprow" colspan="3" style="text-align: left; margin-left: 0pt; margin-right: auto;">
<b><span class="toprowtext">About this Buildbot</span></b>
</td>
</tr>
<tr>
<td colspan="3" class="catrow">
<span class="catrowtext">Version Information</span>
</td>
</tr>
<tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">
Buildbot: {{ buildbot }}
</td>
</tr>
<tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">
Twisted: {{ twisted }}
</td>
</tr>
<tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">
Jinja: {{ jinja }}
</td>
</tr>
<tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">
Python: {{ python }}
</td>
</tr>
<tr align="center">
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">
Buildmaster platform: {{ platform }}
</td>
</tr>
<tr>
<td colspan="3" class="catrow">
<span class="catrowtext">Source code</span>
<td>
</tr>
<tr>
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">
Buildbot is a free software project, released under the terms of the <a href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.
</td>
</tr>
<tr>
<td style="text-align: left;" class="{{ item_class.next() }}" colspan="1" valign="middle">
Please visit the <a href="http://buildbot.net/">Buildbot Home Page</a> for more information, including documentation, bug reports, and source downloads.
</td>
</tr>
<tr>
<td colspan="3" class="catrow">
</td>
</tr>
</table>

{% endblock %}
4 changes: 2 additions & 2 deletions templates/authfail.html
View file
@@ -1,10 +1,10 @@
{% extends "layout.html" %}

{% block content %}
<td>

<h1>Authentication Failed</h1>

<p>The username or password you entered were not correct.
<p>The username or password you entered were not correct.
Please go back and try again.
</p>

Expand Down
10 changes: 10 additions & 0 deletions templates/authzfail.html
View file
@@ -0,0 +1,10 @@
{% extends "layout.html" %}

{% block content %}

<h1>Authorization Failed</h1>

<p>You are not allowed to perform this action.
</p>

{% endblock %}
26 changes: 13 additions & 13 deletions templates/build.html
View file
Expand Up @@ -19,18 +19,18 @@ <h2>Build In Progress:</h2>
{% endif %}

{{ current_step }}

{% if authz.advertiseAction('stopBuild', request) %}
<h2>Stop Build</h2>
{{ forms.stop_build(build_url+"/stop", authz, on_all=False, short=False, label='This Build') }}
{% endif %}
{% else %}
<h2>Results:</h2>

<p class="{{ result_css }} result">
<p class="{{ result_css }} result">
{{ b.getText()|join(' ')|capitalize }}
</p>

{% if b.getTestResults() %}
<h3><a href="{{ tests_link }}"/></h3>
{% endif %}
Expand Down Expand Up @@ -87,13 +87,13 @@ <h3>{{ ss.codebase }}</h3>
# TODO: turn this into a table, or some other sort of definition-list
# that doesn't take up quite so much vertical space
#}

<h2>BuildSlave:</h2>
{% if slave_url %}

{% if slave_url %}
<a href="{{ slave_url|e }}">{{ b.getSlavename()|e }}</a>
{% else %}
{{ b.getSlavename()|e }}
{{ b.getSlavename()|e }}
{% endif %}

<h2>Reason:</h2>
Expand All @@ -116,7 +116,7 @@ <h2>Steps and Logfiles:</h2>
{% for s in steps %}
<li>
<div class="{{ s.css_class }} result">
<a href="{{ s.link }}">{{ s.name }}</a>
<a href="{{ s.link }}">{{ s.name }}</a>
{{ s.text }}&nbsp;<span style="float:right">{{ '( ' + s.time_to_run + ' )' if s.time_to_run else '' }}</span>
</div>

Expand All @@ -127,11 +127,11 @@ <h2>Steps and Logfiles:</h2>
{% else %}
<li class="{{ item_class.next() }}">- no logs -</li>
{% endfor %}

{% for u in s.urls %}
<li class="{{ item_class.next() }}"><a href="{{ u.url }}">{{ u.logname }}</a></li>
{% endfor %}
</ol>
</ol>
</li>
{% endfor %}
</ol>
Expand Down Expand Up @@ -179,15 +179,15 @@ <h2>Forced Build Properties:</h2>
<td class="left">
{% if p.label %}
{{ p.label }}
{% endif %}
{% endif %}
</td>
{% if p.text %}
<td><textarea readonly cols="{{p.cols}}" rows="{{p.rows}}">{{ p.text|e }}</textarea></td>
{% else %}
<td>{{ p.value|e }}</td>
{% endif %}
</tr>
{% endif %}
{% endif %}
{% endfor %}
</table>

Expand Down Expand Up @@ -221,7 +221,7 @@ <h3>Resubmit Build:</h3>
</div>

<br style="clear:both"/>

{% if has_changes %}
<div class="column">
<h2>All Changes:</h2>
Expand Down
39 changes: 28 additions & 11 deletions templates/build_line.html
View file
@@ -1,44 +1,61 @@
{% macro build_line(b, include_builder=False) %}
<small>({{ b.time }})</small>
Rev: {{ b.rev|shortrev(b.rev_repo) }}
Rev: {% if b.multiple_revs -%}
multiple rev
{%- else -%}
{{ b.rev_list[0]['rev']|shortrev(b.rev_list[0]['repo']) }}
{%- endif %}
<span class="{{ b.class }}">{{ b.results }}</span>
{% if include_builder %}
<a href="{{ b.builderurl }}">{{ b.builder_name }}</a>
{% endif %}
<a href="{{ b.buildurl }}">#{{ b.buildnum }}</a> -
<a href="{{ b.buildurl }}">#{{ b.buildnum }}</a> -
{{ b.text|capitalize }}
{% endmacro %}

{% macro build_tr(b, include_builder=False, loop=None) %}
<tr class="{{ loop.cycle('row1', 'row3') if loop }}">
<tr class="{{ loop.cycle('alt', '') if loop }}">
<td>{{ b.time }}</td>
<td>{{ b.rev|shortrev(b.rev_repo) }}</td>
<td>{%- for rev in b.rev_list -%}
{%- if not loop.first %}<br/>{% endif -%}
{%- if rev.get('codebase', '') %}<span class='codebase'>{{ rev['codebase'] }}</span>:&nbsp;{% endif -%}
{{ rev['rev']|shortrev(rev['repo']) }}
{%- endfor -%}
</td>
<td class="{{ b.class }}">{{ b.results }}</td>
{%- if include_builder %}
{%- if include_builder %}
<td><a href="{{ b.builderurl }}">{{ b.builder_name }}</a></td>
{% endif %}
<td><a href="{{ b.buildurl }}">#{{ b.buildnum }}</a></td>
<td><a href="{{ b.buildurl }}">#{{ b.buildnum }}</a></td>
<td><span class='reason'>{{ b.reason|e }}</span>
{%- for user in (b.interested_users or []) -%}
{%- if not loop.first %}, {% endif -%}
<span class='interested_user'>{{ user|e }}</span>
{%- endfor -%}
</td>
<td class="left">{{ b.text|capitalize }}</td>
</tr>
{% endmacro %}

{% macro build_table(builds, include_builder=False) %}
{% if builds %}
<tr>
<th>Time</th>
<table class="info">
<tr>
<th>Time</th>
<th>Revision</th>
<th>Result</th>
{%- if include_builder %}
{%- if include_builder %}
<th>Builder</th>
{% endif %}
<th>Build #</th>
<th>Reason</th>
<th>Info</th>
</tr>
</tr>
{% for b in builds %}
{{ build_tr(b, include_builder, loop) }}
{% endfor %}
</table>
{% else %}
<td style="text-align: left;" class="row1" colspan="1" valign="middle">No matching builds found
No matching builds found
{% endif %}
{% endmacro %}

0 comments on commit 0b9164b

Please sign in to comment.