Skip to content

Commit

Permalink
Merge branch 'following_fields' of git://github.com/pepsiman/buildbot
Browse files Browse the repository at this point in the history
  • Loading branch information
djmitche committed Nov 1, 2013
2 parents f3b6459 + 2ed8cfd commit eb25016
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions master/buildbot/status/web/templates/forms.html
Expand Up @@ -4,12 +4,10 @@
{{ 'style="display:inline"' if short else '' }}>
{% if not short %}
{% if id == 'all' %}
<p>To cancel all builds, fill out the following fields and
push the 'Cancel' button</p>
<p>To cancel all builds, push the 'Cancel' button</p>
<p>To cancel individual builds, click the 'Cancel' buttons above.</p>
{% else %}
<p>To cancel this build, fill out the following fields and
push the 'Cancel' button</p>
<p>To cancel this build, push the 'Cancel' button</p>
{% endif %}
{% endif %}
<input type="hidden" name="id" value="{{ id }}" />
Expand All @@ -23,8 +21,8 @@
{% if changenum %}
<p>To cancel all builds for this change, push the 'Cancel' button</p>
{% else %}
<p>To cancel builds for this builder for a given change, fill out all
fields and push the 'Cancel' button</p>
<p>To cancel builds for this builder for a given change, fill out the
following field and push the 'Cancel' button</p>
{% endif %}

{% if changenum %}
Expand Down

0 comments on commit eb25016

Please sign in to comment.