Use layout.html for builder views.

buildbot/status/web/builder.py

@@ -25,7 +25,7 @@ def __init__(self, builder_status, builder_control):
     def getTitle(self, request):
         return "Buildbot: %s" % html.escape(self.builder_status.getName())
 
-    def build_line(self, build, req):
+    def builder(self, build, req):
         b = {}
 
         b['num'] = build.getNumber()
@@ -48,29 +48,20 @@ def build_line(self, build, req):
 
         return b
 
-    def body(self, req):
+    def content(self, req, cxt):
         b = self.builder_status
         control = self.builder_control
         status = self.getStatus(req)
 
         slaves = b.getSlaves()
         connected_slaves = [s for s in slaves if s.isConnected()]
 
-        projectName = status.getProjectName()
-
-        cxt = {}
-        cxt['path_to_root'] = self.path_to_root(req)
-        cxt['project_name'] = projectName        
-        cxt['name'] = b.getName()
-
-        cxt['current'] = map(lambda x: self.build_line(x, req), b.getCurrentBuilds())            
-
+        cxt['current'] = [self.builder(x, req) for x in b.getCurrentBuilds()]
         numbuilds = req.args.get('numbuilds', ['5'])[0]
         recent = cxt['recent'] = []
         for build in b.generateFinishedBuilds(num_builds=int(numbuilds)):
             recent.append(self.make_line(req, build, False))
 
-
         sl = cxt['slaves'] = []
         for slave in slaves:
             s = {}
@@ -92,10 +83,8 @@ def body(self, req):
             cxt['ping_url'] = path_to_builder(req, b) + '/ping'
 
 
-        template = self.templates.get_template("builder.html")
-        data = template.render(**cxt)
-        data += self.footer(req)
-        return data
+        template = req.site.buildbot_service.templates.get_template("builder.html")
+        return template.render(**cxt)
 
     def force(self, req):
         """
@@ -253,23 +242,16 @@ class BuildersResource(HtmlResource):
     title = "Builders"
     addSlash = True
 
-    def body(self, req):
+    def content(self, req, ctx):
         s = self.getStatus(req)
 
-        # TODO: this is really basic. It should be expanded to include a
-        # brief one-line summary of the builder (perhaps with whatever the
-        # builder is currently doing)
-
-        builders = []
+        ctx['builders'] = builders = []
         for bname in s.getBuilderNames():
             builders.append({'link' : req.childLink(urllib.quote(bname, safe='')),
                              'name' : bname})
 
-        template = self.templates.get_template('builders.html')
-        data = template.render(builders = builders)
-        data += self.footer(req)
-
-        return data
+        template = req.site.buildbot_service.templates.get_template('builders.html')
+        return template.render(ctx)
 
     def getChild(self, path, req):
         s = self.getStatus(req)

buildbot/status/web/templates/builder.html

@@ -1,3 +1,6 @@
+{% extends "layout.html" %}
+{% block content %}
+
 <a href="{{ path_to_root }}">{{ project_name }}</a>
 
 <h1>Builder: {{ name }}</h1>
@@ -67,3 +70,4 @@ <h2>Buildslaves:</h2>
   </form>
 {% endif %}
 
+{% endblock %}

buildbot/status/web/templates/builders.html

@@ -1,7 +1,10 @@
+{% extends "layout.html" %}
+{% block content %}
 <h1>Builders</h1>
 
 <ol>
 {% for b in builders %}
   <li><a href="{{ b.link }}">{{ b.name|e }}</a></li>
 {% endfor %}
 </ol>
+{% endblock %}