[Buildbot-commits] buildbot/buildbot/status/web base.py, 1.22, 1.23 baseweb.py, 1.33, 1.34

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3574/buildbot/status/web

Modified Files:
	base.py baseweb.py 
Log Message:
[project @ web: fix the label of the 'Stop Build' button]

Original author: warner at lothar.com
Date: 2008-03-23 03:14:03+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/base.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- base.py	21 Nov 2007 09:24:18 -0000	1.22
+++ base.py	23 Mar 2008 03:14:52 -0000	1.23
@@ -53,7 +53,7 @@
     label = html.escape(label)
     return ROW_TEMPLATE % {"label": label, "field": field}
 
-def make_stop_form(stopURL, on_all=False):
+def make_stop_form(stopURL, on_all=False, label="Build"):
     if on_all:
         data = """<form action="%s" class='command stopbuild'>
           <p>To stop all builds, fill out the following fields and
@@ -66,7 +66,7 @@
                      "<input type='text' name='username' />")
     data += make_row("Reason for stopping build:",
                      "<input type='text' name='comments' />")
-    data += '<input type="submit" value="Stop Builder" /></form>\n'
+    data += '<input type="submit" value="Stop %s" /></form>\n' % label
     return data
 
 def make_force_build_form(forceURL, on_all=False):

Index: baseweb.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/baseweb.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- baseweb.py	21 Nov 2007 09:25:03 -0000	1.33
+++ baseweb.py	23 Mar 2008 03:14:52 -0000	1.34
@@ -123,7 +123,7 @@
 
         if building:
             stopURL = "builders/_all/stop"
-            data += make_stop_form(stopURL, True)
+            data += make_stop_form(stopURL, True, "Builds")
         if online:
             forceURL = "builders/_all/force"
             data += make_force_build_form(forceURL, True)
@@ -232,7 +232,7 @@
 
         if building:
             stopURL = "builders/_all/stop"
-            data += make_stop_form(stopURL, True)
+            data += make_stop_form(stopURL, True, "Builds")
         if online:
             forceURL = "builders/_all/force"
             data += make_force_build_form(forceURL, True)