[Scummvm-cvs-logs] SF.net SVN: scummvm:[56229] buildbot/templates
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Sat Jan 21 00:58:11 CET 2012
Revision: 56229
http://scummvm.svn.sourceforge.net/scummvm/?rev=56229&view=rev
Author: dhewg
Date: 2012-01-20 23:58:09 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
BUILDBOT: Update jinja template
diff -u /tmp/buildbot-0.8.3p1/buildbot/status/web/templates/ /tmp/buildbot-0.8.5/buildbot/status/web/templates/ | patch -p5
Modified Paths:
--------------
buildbot/templates/builders.html
buildbot/templates/buildslaves.html
buildbot/templates/change.html
buildbot/templates/change_macros.html
buildbot/templates/console.html
buildbot/templates/feed_atom10.xml
buildbot/templates/feed_description.html
buildbot/templates/feed_rss20.xml
buildbot/templates/footer.html
buildbot/templates/forms.html
buildbot/templates/grid.html
buildbot/templates/grid_transposed.html
buildbot/templates/layout.html
buildbot/templates/logs.html
buildbot/templates/root.html
Modified: buildbot/templates/builders.html
===================================================================
--- buildbot/templates/builders.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/builders.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -31,16 +31,20 @@
</table>
{% if num_building > 0 %}
- {% if authz.advertiseAction('stopBuild') %}
+ {% if authz.advertiseAction('stopAllBuilds') or authz.advertiseAction('stopBuild') %}
+ <h2>Stop Selected Builds</h2>
+ {{ forms.stop_build(path_to_root+"builders/_selected/stopselected", authz, on_selected=True, builders=builders, label='Selected Builds') }}
<h2>Stop All Builds</h2>
{{ forms.stop_build(path_to_root+"builders/_all/stopall", authz, on_all=True, label='All Builds') }}
{% endif %}
{% endif %}
{% if num_online > 0 %}
- {% if authz.advertiseAction('forceAllBuilds') %}
+ {% if authz.advertiseAction('forceAllBuilds') or authz.advertiseAction('forceBuild') %}
+ <h2>Force Selected Builds</h2>
+ {{ forms.force_build(path_to_root+"builders/_selected/forceselected", authz, on_selected=True, builders=builders) }}
<h2>Force All Builds</h2>
- {{ forms.force_build(path_to_root+"builders/_all/forceall", authz, True) }}
+ {{ forms.force_build(path_to_root+"builders/_all/forceall", authz, on_all=True) }}
{% endif %}
{% endif %}
Modified: buildbot/templates/buildslaves.html
===================================================================
--- buildbot/templates/buildslaves.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/buildslaves.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -42,12 +42,11 @@
<td class="{{ item_class.current }}" >{{ (s.version or '-')|e }}</td>
- {% if s.connected %}
- <td class="{{ item_class.current }}" >
- {%- if s.admin -%}
- {{ s.admin|email }}
- {%- endif -%}
- </td>
+ {%- if s.admin -%}
+ <td>{{ s.admin|email }}</td>
+ {%- else -%}
+ <td>-</td>
+ {%- endif -%}
<td class="{{ item_class.current }}" >
{%- if s.last_heard_from_age -%}
@@ -55,11 +54,6 @@
{%- endif -%}
</td>
- {% else %}
- <td class="{{ item_class.current }}" >-</td>
- <td class="{{ item_class.current }}" >-</td>
- {% endif %}
-
<td class="{{ item_class.next() }}">
{{ s.connectCount }}
</td>
Modified: buildbot/templates/change.html
===================================================================
--- buildbot/templates/change.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/change.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -4,7 +4,7 @@
{% block content %}
<td>
-<h1>{{ title }}</h1>
+<h1>{{ pageTitle }}</h1>
<div class="column">
Modified: buildbot/templates/change_macros.html
===================================================================
--- buildbot/templates/change_macros.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/change_macros.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -67,6 +67,6 @@
{% endif %}
{%- endmacro %}
-{% macro box_contents(who, url, title) -%}
-<a href="{{ url }}" title="{{ title|e }}">{{ who|user }}</a>
+{% macro box_contents(who, url, pageTitle) -%}
+<a href="{{ url }}" title="{{ pageTitle|e }}">{{ who|user }}</a>
{%- endmacro %}
Modified: buildbot/templates/console.html
===================================================================
--- buildbot/templates/console.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/console.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -96,6 +96,9 @@
{% if repository %}
<br><b>Repository:</b> {{ repository|e }}
{% endif %}
+{% if project %}
+ <br><b>Project:</b> {{ project|e }}
+{% endif %}
{% if branch != ANYBRANCH %}
<br><b>Branch:</b> {{ branch|e }}
{% endif %}
@@ -173,7 +176,7 @@
<tr>
{% for s in slaves[c.name] %}
<td class='DevSlaveBox'>
- <a href='{{ s.url }}' title='{{ s.title }}' class='DevSlaveBox {{ s.color }}' target="_blank">
+ <a href='{{ s.url }}' title='{{ s.pageTitle }}' class='DevSlaveBox {{ s.color }}' target="_blank">
</a>
</td>
{% endfor %}
@@ -203,7 +206,7 @@
{% for b in r.builds[c.name] %}
<td class='DevStatusBox'>
<a href='#' onclick='showBuildBox("{{ b.url }}", event); return false;'
- title='{{ b.title|e }}' class='DevStatusBox {{ b.color }} {{ b.tag }}'
+ title='{{ b.pageTitle|e }}' class='DevStatusBox {{ b.color }} {{ b.tag }}'
target="_blank"></a>
</td>
{% endfor %}
Modified: buildbot/templates/feed_atom10.xml
===================================================================
--- buildbot/templates/feed_atom10.xml 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/feed_atom10.xml 2012-01-20 23:58:09 UTC (rev 56229)
@@ -2,11 +2,11 @@
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
- <id>{{ project_url }}</id>
- <title>{{ title|e }}</title>
+ <id>{{ title_url }}</id>
+ <title>{{ pageTitle|e }}</title>
{% if project_url -%}
- <link rel="self" href="{{ project_url }}/atom"/>
- <link rel="alternate" href="{{ project_url }}"/>
+ <link rel="self" href="{{ title_url }}/atom"/>
+ <link rel="alternate" href="{{ title_url }}"/>
{% endif %}
{%- if description -%}
<subtitle>{{ description }}</subtitle>
@@ -20,11 +20,11 @@
{% for b in builds -%}
<entry>
- <title>{{ b.title }}</title>
+ <title>{{ b.pageTitle }}</title>
<link href="{{ b.link }}"/>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml">
- {{ item_desc(b, project_url, project_name)|indent(6) }}
+ {{ item_desc(b, title_url, title)|indent(6) }}
<pre xml:space="preserve">{{ b.log_lines|join('\n')|e }}</pre>
</div>
</content>
Modified: buildbot/templates/feed_description.html
===================================================================
--- buildbot/templates/feed_description.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/feed_description.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -1,7 +1,7 @@
-{% macro item_desc(b, project_url, project_name) -%}
+{% macro item_desc(b, title_url, title) -%}
<p>
Date: {{ b.date }}<br/>
- Project home: <a href="{{ project_url }}">{{ project_name|e }}</a><br/>
+ Project home: <a href="{{ title_url }}">{{ title|e }}</a><br/>
Builder summary: <a href="{{ b.summary_link }}">{{ b.name }}</a><br/>
Build details: <a href="{{ b.link }}">Build {{ b.number }}</a><br/>
Author list: <b>{{ b.responsible_users|join(', ') }}</b><br/>
Modified: buildbot/templates/feed_rss20.xml
===================================================================
--- buildbot/templates/feed_rss20.xml 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/feed_rss20.xml 2012-01-20 23:58:09 UTC (rev 56229)
@@ -3,9 +3,9 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
- <title>{{ title|e }}</title>
- <link>{{ project_url }}</link>
- <atom:link href="{{ project_url }}rss" rel="self" type="application/rss+xml"/>
+ <title>{{ pageTitle|e }}</title>
+ <link>{{ title_url }}</link>
+ <atom:link href="{{ title_url }}rss" rel="self" type="application/rss+xml"/>
{% if language -%}
<language>{{ language }}</language>
{% endif %}
@@ -18,11 +18,11 @@
{% for b in builds -%}
<item>
- <title>{{ b.title }}</title>
+ <title>{{ b.pageTitle }}</title>
<link>{{ b.link }}</link>
<description>
<![CDATA[
- {{ item_desc(b, project_url, project_name)|indent(8) }}
+ {{ item_desc(b, title_url, title)|indent(8) }}
<pre>{{ b.log_lines|join('\n')|e }}</pre>
]]>
</description>
Modified: buildbot/templates/footer.html
===================================================================
--- buildbot/templates/footer.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/footer.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -6,12 +6,12 @@
<a href="http://buildbot.net/">Buildbot</a>-{{ version }}
-{% if project_name %}
+{% if title %}
working for
- {% if project_url %}
- <a href="{{ project_url }}">{{ project_name }}</a>
+ {% if title_url %}
+ <a href="{{ title_url }}">{{ title }}</a>
{% else %}
- {{ project_name }}
+ {{ title }}
{% endif %}
project
{% endif %}
Modified: buildbot/templates/forms.html
===================================================================
--- buildbot/templates/forms.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/forms.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -63,17 +63,29 @@
{% endif %}
{% endmacro %}
-{% macro stop_build(stop_url, authz, on_all=False, short=False, label="Build") %}
+{% macro stop_build(stop_url, authz, on_all=False, on_selected=False, builders=[], short=False, label="Build") %}
{% if not short or not authz.needAuthForm('stopBuild') %}
<form method="post" name="stop_build" action="{{ stop_url }}" class='command stopbuild'
{{ 'style="display:inline"' if short else '' }}>
{% if not short %}
{% if on_all %}
- <p>To stop all builds, fill out the following fields and
- push the <i>Stop {{label}}</i> button</p>
+ <p>To stop all builds, fill out the following field and
+ push the <i>Stop {{ label }}</i> button</p>
+ {% elif on_selected %}
+ <p>To stop selected builds, select the builders, fill out the
+ following field and push the <i>Stop {{ label }}</i> button</p>
+ <table>
+ {% for b in builders %}
+ <tr>
+ <td align="center"><input type="checkbox" name="selected" value="{{ b.name }}"></td>
+ <td class="box"><a href="{{ b.link }}">{{ b.name|e }}</a></td>
+ </tr>
+ {% endfor %}
+ </table>
+
{% else %}
- <p>To stop this build, fill out the following fields and
- push the <i>Stop {{label}}</i> button</p>
+ <p>To stop this build, fill out the following field and
+ push the <i>Stop {{ label }}</i> button</p>
{% endif %}
{% endif %}
@@ -93,12 +105,26 @@
{% endif %}
{% endmacro %}
-{% macro force_build(force_url, authz, on_all=False) %}
- <form method="post" name="force_build" action="{{ force_url }}" class="command forcebuild">
+{% macro force_build(force_url, authz, on_all=False, on_selected=False, builders=[]) %}
+ <form method="post" name="force_build" action="{{ force_url }}" class="command forcebuild">
{% if on_all %}
<p>To force a build on <strong>all Builders</strong>, fill out the following fields
and push the 'Force Build' button</p>
+ {% elif on_selected %}
+ <p>To force a build on <strong>certain Builders</strong>, select the
+ builders, fill out the following fields and push the
+ 'Force Build' button</p>
+
+ <table>
+ {% for b in builders %}
+ <tr>
+ <td align="center"><input type="checkbox" name="selected" value="{{ b.name }}"></td>
+ <td class="box"><a href="{{ b.link }}">{{ b.name|e }}</a></td>
+ </tr>
+ {% endfor %}
+ </table>
+
{% else %}
<p>To force a build, fill out the following fields and
push the 'Force Build' button</p>
@@ -108,9 +134,7 @@
{{ auth() }}
{% else %}
<div class="row">
- <span class="label">
- Your name:
- </span>
+ <span class="label">Your name:</span>
<input type="text" name="username"/>
</div>
{% endif %}
@@ -238,3 +262,14 @@
</form>
{% endmacro %}
+{% macro show_users(users_url, authz) %}
+ <form method="post" action="{{ users_url }}" class='command show_users'>
+ <p>To show users, press the 'Show Users' button</p>
+
+ {% if authz.needAuthForm('showUsersPage') %}
+ {{ auth() }}
+ {% endif %}
+
+ <input type="submit" value="Show Users" />
+ </form>
+{% endmacro %}
Modified: buildbot/templates/grid.html
===================================================================
--- buildbot/templates/grid.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/grid.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -15,7 +15,7 @@
<table class="Grid" border="0" cellspacing="0">
<tr>
- <td class="title"><a href="{{ project_url }}">{{ project_name }}</a>
+ <td class="title"><a href="{{ title_url }}">{{ title }}</a>
{{ grid.category_title() }}
</td>
Modified: buildbot/templates/grid_transposed.html
===================================================================
--- buildbot/templates/grid_transposed.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/grid_transposed.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -15,7 +15,7 @@
<table class="Grid" border="0" cellspacing="0">
<tr>
- <td class="title"><a href="{{ project_url }}">{{ project_name }}</a>
+ <td class="title"><a href="{{ title_url }}">{{ title }}</a>
{{ grid.category_title() }}
</td>
{% for builder in builders %}
Modified: buildbot/templates/layout.html
===================================================================
--- buildbot/templates/layout.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/layout.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -12,7 +12,7 @@
{% if refresh %}
<meta http-equiv="refresh" content="{{ refresh|e }}"/>
{% endif %}
- <title>{{ title|e }}</title>
+ <title>{{ pageTitle|e }}</title>
<link rel="stylesheet" href="{{ stylesheet }}" type="text/css" />
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ path_to_root }}rss">
<link rel="shortcut icon" href="{{ path_to_root }}favicon.ico">
@@ -74,11 +74,11 @@
<div align="center">
<span class="smalltext">Powered by <a href="http://buildbot.net/">BuildBot</a> ({{version}})<br />
About this <a href="{{ path_to_root }}about" class="smalllink">Buildbot setup</a><br />
- Design by the {% if project_name -%}
- {%- if project_url -%}
- <a href="{{ project_url }}">{{ project_name }}</a>
+ Design by the {% if title -%}
+ {%- if title_url -%}
+ <a href="{{ title_url }}">{{ title }}</a>
{%- else -%}
- {{ project_name }}
+ {{ title }}
{%- endif -%}
{%- endif -%} team <br/>
Modified: buildbot/templates/logs.html
===================================================================
--- buildbot/templates/logs.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/logs.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -1,8 +1,8 @@
-{%- macro page_header(title, path_to_root, texturl) -%}
+{%- macro page_header(pageTitle, path_to_root, texturl) -%}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
- <head><title>{{ title }}</title>
+ <head><title>{{ pageTitle }}</title>
<link rel="stylesheet" href="{{ path_to_root }}default.css" type="text/css" />
</head>
<body class='log'>
Modified: buildbot/templates/root.html
===================================================================
--- buildbot/templates/root.html 2012-01-20 22:22:34 UTC (rev 56228)
+++ buildbot/templates/root.html 2012-01-20 23:58:09 UTC (rev 56229)
@@ -8,9 +8,9 @@
<tr align="center">
<td class="toprow" colspan="3" style="text-align: left; margin-left: 0pt; margin-right: auto;">
<b><span class="toprowtext">Welcome to the Buildbot
-{%- if project_name -%}
+{%- if title -%}
for the
- {{ project_name }}
+ {{ title }}
project
{%- endif -%}
...</span></b>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list