Author: David Schneider <david.schnei...@picle.org>
Branch: buildbot-0.8.7
Changeset: r808:ca61edc31d5e
Date: 2013-04-26 21:34 +0200
http://bitbucket.org/pypy/buildbot/changeset/ca61edc31d5e/
Log: update templates
diff --git a/master/templates/build.html b/master/templates/build.html
--- a/master/templates/build.html
+++ b/master/templates/build.html
@@ -7,9 +7,9 @@
<h1>
Builder <a href="{{ path_to_builder }}">{{ b.getBuilder().getName() }}</a>
Build #{{ b.getNumber() }}
+</h1>
<!-- PyPy specific change: add a "view in summary" link -->
(<a href="{{ path_to_root }}summary?builder={{
b.getBuilder().getName() }}">view in summary</a>)
-</h1>
<div class="column">
@@ -38,46 +38,52 @@
{% endif %}
{% endif %}
+<h2>
+{% if sourcestamps|count == 1 %}
+SourceStamp:
+{% else %}
+SourceStamps:
+{% endif %}
+</h2>
-<h2>SourceStamp:</h2>
+{% for ss in sourcestamps %}
+<h3>{{ ss.codebase }}</h3>
+ <table class="info" width="100%">
+ {% set ss_class = cycler('alt','') %}
-<table class="info" width="100%">
-{% set ss_class = cycler('alt','') %}
+ {% if ss.project %}
+ <tr class="{{ ss_class.next() }}"><td class="left">Project</td><td>{{
ss.project|projectlink }}</td></tr>
+ {% endif %}
-{% set ss = sourcestamps[0] %}
-{% if ss.project %}
- <tr class="{{ ss_class.next() }}"><td class="left">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>
+ {% endif %}
-{% if ss.repository %}
- <tr class="{{ ss_class.next() }}"><td class="left">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>
+ {% endif %}
-{% if ss.branch %}
- <tr class="{{ ss_class.next() }}"><td class="left">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>
+ {% endif %}
-{% if ss.revision %}
- <tr class="{{ ss_class.next() }}"><td class="left">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>
+ {% endif %}
-{% if got_revision %}
- <tr class="{{ ss_class.next() }}"><td class="left">Got Revision</td><td>{{
got_revision|revlink(ss.repository) }}</td></tr>
-{% endif %}
+ {% if ss.patch %}
+ <tr class="{{ ss_class.next() }}"><td
class="left">Patch</td><td>YES</td></tr>
+ {% endif %}
-{% if ss.patch %}
- <tr class="{{ ss_class.next() }}"><td
class="left">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>
+ {% endif %}
-{% if ss.changes %}
- <tr class="{{ ss_class.next() }}"><td class="left">Changes</td><td>see
below</td></tr>
-{% endif %}
-
-{% if most_recent_rev_build %}
- <tr class="{{ ss_class.next() }}"><td class="left" colspan="2">Build of most
recent revision</td></tr>
-{% endif %}
-
-</table>
+ {% 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>
+ {% endif %}
+ </table>
+{% endfor %}
{#
# TODO: turn this into a table, or some other sort of definition-list
@@ -141,20 +147,53 @@
<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>
- {% if p.short_value %}
- <td>{{ p.short_value|e }} .. [property value too long]</td>
- {% else %}
- <td>{{ p.value|e }}</td>
- {% endif %}
+ {% if p.short_value %}
+ <td>{{ p.short_value|e }} .. [property value too long]</td>
+ {% else %}
+ {% if p.value is not mapping %}
+ <td>{{ p.value|e }}</td>
+ {% else %}
+ <td>
+ <table class="info" width="100%">
+ {%- for key, value in p.value.items() recursive %}
+ <tr><td>{{ key|e }}</td><td>{{ value|e }}</td></tr>
+ {% endfor %}
+ </table>
+ </td>
+ {% endif %}
+ {% endif %}
<td>{{ p.source|e }}</td>
</tr>
+{% endif %}
{% endfor %}
+</table>
+<h2>Forced Build Properties:</h2>
+<table class="info" width="100%">
+<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">
+ {% if p.label %}
+ {{ p.label }}
+ {% 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 %}
+{% endfor %}
</table>
-<h2>Blamelist:</h2>
+<h2>Responsible Users:</h2>
{% if responsible_users %}
<ol>
@@ -179,27 +218,30 @@
<!-- PyPy specific change: hide the "resubmit build section"
{% if authz.advertiseAction('forceBuild', request) %}
<h3>Resubmit Build:</h3>
- {{ forms.rebuild_build(build_url+"/rebuild", authz, exactly, ss) }}
+ {{ forms.rebuild_build(build_url+"/rebuild", authz, exactly,
sourcestamps[0]) }}
{% endif %}
--->
+ --!>
</div>
<br style="clear:both"/>
-{% if ss.changes %}
-<div class="column">
- <h2>All Changes:</h2>
- <ol>
- {% for c in ss.changes %}
- <li><h3>Change #{{ c.number }}</h3>
- {{ change(c.asDict()) }}
- </li>
- {% else %}
- <li>no changes</li>
- {% endfor %}
- </ol>
-</div>
+{% if has_changes %}
+ <div class="column">
+ <h2>All Changes:</h2>
+ {% for ss in sourcestamps %}
+ {% if ss.changes %}
+ <h3 id="changes-{{ ss.codebase }}"> {{ ss.codebase }}:</h3>
+ <ol>
+ {% for c in ss.changes %}
+ <li><h3>Change #{{ c.number }}</h3>
+ {{ change(c.asDict()) }}
+ </li>
+ {% endfor %}
+ </ol>
+ {% endif %}
+ {% endfor %}
+ </div>
{% endif %}
{% endblock %}
diff --git a/master/templates/builder.html b/master/templates/builder.html
--- a/master/templates/builder.html
+++ b/master/templates/builder.html
@@ -5,7 +5,6 @@
{% block content %}
<h1>Builder {{ name }}</h1>
-
<!-- PyPy specific change: add the "view in summary" link -->
<p>
(<a href="{{ path_to_root }}waterfall?show={{ name }}">view in waterfall</a>)
@@ -48,17 +47,22 @@
{% if b.num_changes < 4 %}
{% for c in b.changes %}{{ c.revision|shortrev(c.repo) }}
- (<a href="{{ c.url }}">{{ c.who }}</a>){% if not loop.last %},{% endif
%}
+ (<a href="{{ c.url }}">{{ c.who|email }}</a>){% if not loop.last %},{%
endif %}
{% endfor %}
{% else %}
({{ b.num_changes }} changes)
{% endif %}
+ {% if 'owner' in b.properties %}
+ <b>Forced build</b>
+ by {{b.properties['owner'][0]}}
+ <small>{{b.properties['reason'][0]}}</small>
+ {% endif %}
</li>
{% endfor %}
</ul>
- {% if authz.advertiseAction('cancelPendingBuild', requeset) %}
+ {% if authz.advertiseAction('cancelPendingBuild', request) %}
{{ forms.cancel_pending_build(builder_url+"/cancelbuild", authz,
short=False, id='all') }}
{% endif %}
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
