[Buildbot-commits] buildbot/buildbot/status classic.css,NONE,1.1 html.py,1.55,1.56

Tue Apr 26 02:43:14 UTC 2005

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16751/buildbot/status

Modified Files:
	html.py 
Added Files:
	classic.css 
Log Message:
* buildbot/status/html.py (HtmlResource.content): make the
stylesheet <link> always point at "buildbot.css".
(StatusResource.getChild): map "buildbot.css" to a static.File
containing whatever css= argument was provided to Waterfall()
(Waterfall): provide the "classic" css as the default.
* docs/waterfall.classic.css: move default CSS from here ..
* buildbot/status/classic.css: .. to here

* MANIFEST.in: make sure classic.css is included in the tarball
* setup.py: and that it is installed too, under buildbot/status/

--- NEW FILE: classic.css ---
a:visited {
	color: #800080;
}

td.Event, td.BuildStep, td.Activity, td.Change, td.Time, td.Builder {
    border-top: 1px solid;
    border-right: 1px solid;
}

/* Activity states */
.idle {
	background-color: white;
}

/* LastBuild, BuildStep states */
.success {
	background-color: #72ff75;
}
.failure {
	background-color: red;
}
.warnings {
	background-color: orange;
}
.exception {
	background-color: #c000c0;
}
.start,.running {
	background-color: yellow;
}

Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- html.py	24 Apr 2005 21:30:25 -0000	1.55
+++ html.py	26 Apr 2005 02:43:12 -0000	1.56
@@ -150,9 +150,11 @@
     def content(self, request):
         data = "<html>\n<head><title>" + self.title + "</title></head>\n"
         if self.css:
+            # TODO: use some sort of relative link up to the root page, so
+            # this css can be used from child pages too
             data += ("<link href=\"%s\""
                      " rel=\"stylesheet\""
-                     " type=\"text/css\">\n" % self.css)
+                     " type=\"text/css\">\n" % "buildbot.css")
         data += "<body vlink=\"#800080\">\n"
         data += self.body(request)
         data += "</body></html>\n"
@@ -1349,7 +1351,7 @@
 
     def getChild(self, path, request):
         if path == "buildbot.css" and self.css:
-            return static.File("buildbot.css")
+            return static.File(self.css)
         if path == "changes":
             return StatusResourceChanges(self.changemaster)
         if path == "favicon.ico":
@@ -1369,6 +1371,7 @@
 # the icon is sibpath(__file__, "../buildbot.png") . This is for portability.
 up = os.path.dirname
 buildbot_icon = os.path.abspath(os.path.join(up(up(__file__)), "buildbot.png"))
+buildbot_css = os.path.abspath(os.path.join(up(__file__), "classic.css"))
 
 class Waterfall(service.MultiService, util.ComparableMixin):
     """I implement the primary web-page status interface, called a 'Waterfall
@@ -1414,7 +1417,7 @@
                      "categories", "css"]
 
     def __init__(self, http_port=None, distrib_port=None, allowForce=True,
-                 categories=None, css=None, favicon=buildbot_icon):
+                 categories=None, css=buildbot_css, favicon=buildbot_icon):
         """
 
         xxxTo have the buildbot run its own web server, pass a port number to



