[Buildbot-commits] buildbot/buildbot/status/web slaves.py, 1.1, 1.2 waterfall.py, 1.18, 1.19

[Brian Warner]

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

Modified Files:
	slaves.py waterfall.py 
Log Message:
[project @ waterfall: make links more visually distinct, handle unused buildslaves]

Original author: warner at lothar.com
Date: 2007-09-25 22:45:55+00:00

Index: slaves.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/slaves.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- slaves.py	12 Aug 2007 22:23:07 -0000	1.1
+++ slaves.py	25 Sep 2007 22:50:36 -0000	1.2
@@ -31,8 +31,11 @@
             data += " <li>%s:\n" % name
             data += " <ul>\n"
             builder_links = ['<a href="../builders/%s">%s</a>' % (bname, bname)
-                             for bname in used_by_builder[name]]
-            data += "  <li>Used by: %s</li>\n" % ", ".join(builder_links)
+                             for bname in used_by_builder.get(name, [])]
+            if builder_links:
+                data += "  <li>Used by: %s</li>\n" % ", ".join(builder_links)
+            else:
+                data += "  <li>Not used by any Builders</li>\n"
             if slave.isConnected():
                 data += "  <li>Slave is currently connected</li>\n"
                 admin = slave.getAdmin()

Index: waterfall.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/waterfall.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- waterfall.py	25 Sep 2007 22:50:31 -0000	1.18
+++ waterfall.py	25 Sep 2007 22:50:36 -0000	1.19
@@ -304,6 +304,7 @@
 
 %(show_reload_input)s
 
+<h2>Reload Waterfall Page</h2>
 
 <input type="submit" value="View Waterfall" />
 </form>
@@ -545,15 +546,18 @@
             bottom = timestamps[-1]
             nextpage = with_args(request, ["last_time"],
                                  [("last_time", str(int(bottom)))])
-            data += '<a href="%s">next page</a>\n' % nextpage
+            data += '[<a href="%s">next page</a>]\n' % nextpage
 
         helpurl = self.path_to_root(request) + "waterfall/help"
         helppage = with_args(request, new_path=helpurl)
-        data += '<a href="%s">help</a>\n' % helppage
+        data += '[<a href="%s">help</a>]\n' % helppage
+
+        welcomeurl = self.path_to_root(request) + "."
+        data += '[<a href="%s">welcome</a>]\n' % welcomeurl
 
         if self.get_reload_time(request) is not None:
             no_reload_page = with_args(request, remove_args=["reload"])
-            data += '<a href="%s">Stop Reloading</a>\n' % no_reload_page
+            data += '[<a href="%s">Stop Reloading</a>]\n' % no_reload_page
 
         data += "<br />\n"