rename title to pageTitle where it refers to HTML or XML <title> elem…

…ents

master/buildbot/status/web/about.py

@@ -21,7 +21,7 @@
 import jinja2
 
 class AboutBuildbot(HtmlResource):
-    title = "About this Buildbot"
+    pageTitle = "About this Buildbot"
 
     def content(self, request, cxt):
         cxt.update(dict(buildbot=buildbot.version, 

master/buildbot/status/web/auth.py

@@ -99,7 +99,7 @@ def authenticate(self, user, passwd):
         return res
 
 class AuthFailResource(HtmlResource):
-    title = "Authentication Failed"
+    pageTitle = "Authentication Failed"
 
     def content(self, request, cxt):
         template = request.site.buildbot_service.templates.get_template("authfail.html")

master/buildbot/status/web/base.py

@@ -175,8 +175,8 @@ class AccessorMixin(object):
     def getStatus(self, request):
         return request.site.buildbot_service.getStatus()    
 
-    def getTitle(self, request):
-        return self.title
+    def getPageTitle(self, request):
+        return self.pageTitle
 
     def getAuthz(self, request):
         return request.site.buildbot_service.authz
@@ -203,7 +203,7 @@ def getContext(self, request):
                                         time.localtime(util.now())),
                     tz = locale_tz,
                     metatags = [],
-                    title = self.getTitle(request),
+                    pageTitle = self.getPageTitle(request),
                     welcomeurl = rootpath,
                     authz = self.getAuthz(request),
                     )
@@ -242,7 +242,7 @@ def fail(f):
 class HtmlResource(resource.Resource, ContextMixin):
     # this is a cheap sort of template thingy
     contentType = "text/html; charset=utf-8"
-    title = "Buildbot"
+    pageTitle = "Buildbot"
     addSlash = False # adapted from Nevow
 
     def getChild(self, path, request):
@@ -324,13 +324,13 @@ def fail(f):
         return server.NOT_DONE_YET
 
 class StaticHTML(HtmlResource):
-    def __init__(self, body, title):
+    def __init__(self, body, pageTitle):
         HtmlResource.__init__(self)
         self.bodyHTML = body
-        self.title = title
+        self.pageTitle = pageTitle
     def content(self, request, cxt):
         cxt['content'] = self.bodyHTML
-        cxt['title'] = self.title
+        cxt['pageTitle'] = self.pageTitle
         template = request.site.buildbot_service.templates.get_template("empty.html")
         return template.render(**cxt)
 
@@ -343,7 +343,7 @@ class DirectoryLister(static.DirectoryLister, ContextMixin):
         """This variant of the static.DirectoryLister uses a template
         for rendering."""
 
-        title = 'BuildBot'
+        pageTitle = 'BuildBot'
 
         def render(self, request):
             cxt = self.getContext(request)

master/buildbot/status/web/build.py

@@ -38,7 +38,7 @@ def __init__(self, build_status):
         HtmlResource.__init__(self)
         self.build_status = build_status
 
-    def getTitle(self, request):
+    def getPageTitle(self, request):
         return ("Buildbot: %s Build #%d" %
                 (self.build_status.getBuilder().getName(),
                  self.build_status.getNumber()))

master/buildbot/status/web/builder.py

@@ -36,7 +36,7 @@ def __init__(self, builder_status):
         HtmlResource.__init__(self)
         self.builder_status = builder_status
 
-    def getTitle(self, request):
+    def getPageTitle(self, request):
         return "Buildbot: %s" % self.builder_status.getName()
 
     def builder(self, build, req):
@@ -397,7 +397,7 @@ def stopall(self, req):
 
 # /builders
 class BuildersResource(HtmlResource):
-    title = "Builders"
+    pageTitle = "Builders"
     addSlash = True
 
     @defer.deferredGenerator

master/buildbot/status/web/changes.py

@@ -24,7 +24,7 @@
 class ChangeResource(HtmlResource):
     def __init__(self, changeid):
         self.changeid = changeid
-        self.title = "Change #%d" % changeid
+        self.pageTitle = "Change #%d" % changeid
 
     def content(self, req, cxt):
         d = self.getStatus(req).getChange(self.changeid)
@@ -63,7 +63,7 @@ def getBox(self, req):
         template = req.site.buildbot_service.templates.get_template("change_macros.html")
         text = template.module.box_contents(url=url,
                                             who=self.original.getShortAuthor(),
-                                            title=self.original.comments)
+                                            pageTitle=self.original.comments)
         return Box([text], class_="Change")
 components.registerAdapter(ChangeBox, Change, IBox)
 

master/buildbot/status/web/console.py

@@ -102,7 +102,7 @@ def __init__(self, orderByTime=False):
         else:
             self.comparator = IntegerRevisionComparator()
 
-    def getTitle(self, request):
+    def getPageTitle(self, request):
         status = self.getStatus(request)
         title = status.getTitle()
         if title:
@@ -392,7 +392,7 @@ def displaySlaveLine(self, status, builderList, debugInfo):
             for builder in builderList[category]:
                 s = {}
                 s["color"] = "notstarted"
-                s["title"] = builder
+                s["pageTitle"] = builder
                 s["url"] = "./builders/%s" % urllib.quote(builder)
                 state, builds = status.getBuilder(builder).getState()
                 # Check if it's offline, if so, the box is purple.
@@ -461,15 +461,15 @@ def displayStatusLine(self, builderList, allBuilds, revision, debugInfo):
                     isRunning = True
 
                 url = "./waterfall"
-                title = builder
+                pageTitle = builder
                 tag = ""
                 current_details = {}
                 if introducedIn:
                     current_details = introducedIn.details or ""
                     url = "./buildstatus?builder=%s&number=%s" % (urllib.quote(builder),
                                                                   introducedIn.number)
-                    title += " "
-                    title += urllib.quote(' '.join(introducedIn.text), ' \n\\/:')
+                    pageTitle += " "
+                    pageTitle += urllib.quote(' '.join(introducedIn.text), ' \n\\/:')
 
                     builderStrip = builder.replace(' ', '')
                     builderStrip = builderStrip.replace('(', '')
@@ -478,13 +478,13 @@ def displayStatusLine(self, builderList, allBuilds, revision, debugInfo):
                     tag = "Tag%s%s" % (builderStrip, introducedIn.number)
 
                 if isRunning:
-                    title += ' ETA: %ds' % (introducedIn.eta or 0)
+                    pageTitle += ' ETA: %ds' % (introducedIn.eta or 0)
 
                 resultsClass = getResultsClass(results, previousResults, isRunning)
 
                 b = {}                
                 b["url"] = url
-                b["title"] = title
+                b["pageTitle"] = pageTitle
                 b["color"] = resultsClass
                 b["tag"] = tag
 

master/buildbot/status/web/feeds.py

@@ -60,16 +60,16 @@ def render(self, request):
         return data
 
 class FeedResource(XmlResource):
-    title = None
+    pageTitle = None
     link = 'http://dummylink'
     language = 'en-us'
     description = 'Dummy rss'
     status = None
 
-    def __init__(self, status, categories=None, title=None):
+    def __init__(self, status, categories=None, pageTitle=None):
         self.status = status
         self.categories = categories
-        self.title = title
+        self.pageTitle = pageTitle
         self.title = self.status.getTitle()
         self.link = self.status.getBuildbotURL()
         self.description = 'List of builds'
@@ -192,7 +192,7 @@ def content(self, request):
                     got_revision = "[revision string too long]"
                 source += "(Got Revision: %s)" % got_revision
             failflag = (build.getResults() != FAILURE)
-            title = ('%s %s on "%s"' %
+            pageTitle = ('%s %s on "%s"' %
                      (source, ["failed","succeeded"][failflag],
                       build.getBuilder().getName()))
 
@@ -228,7 +228,7 @@ def content(self, request):
             bc['number'] = build.getNumber()
             bc['responsible_users'] = build.getResponsibleUsers()
             bc['failed_steps'] = failed_steps
-            bc['title'] = title
+            bc['pageTitle'] = pageTitle
             bc['link'] = link
             bc['log_lines'] = log_lines
 
@@ -247,12 +247,12 @@ def content(self, request):
 
             build_cxts.append(bc)
 
-        title = self.title
-        if not title:
-            title = 'Build status of %s' % self.title
+        pageTitle = self.pageTitle
+        if not pageTitle:
+            pageTitle = 'Build status of %s' % self.pageTitle
 
         cxt = {}
-        cxt['title'] = title
+        cxt['pageTitle'] = pageTitle
         cxt['title_url'] = self.link
         cxt['title'] = self.title
         cxt['language'] = self.language
@@ -271,12 +271,12 @@ class Rss20StatusResource(FeedResource):
     # contentType = 'application/rss+xml' (browser dependent)
     template_file = 'feed_rss20.xml'
 
-    def __init__(self, status, categories=None, title=None):
-        FeedResource.__init__(self, status, categories, title)
+    def __init__(self, status, categories=None, pageTitle=None):
+        FeedResource.__init__(self, status, categories, pageTitle)
 
 class Atom10StatusResource(FeedResource):
     # contentType = 'application/atom+xml' (browser dependent)
     template_file = 'feed_atom10.xml'
 
-    def __init__(self, status, categories=None, title=None):
-        FeedResource.__init__(self, status, categories, title)
+    def __init__(self, status, categories=None, pageTitle=None):
+        FeedResource.__init__(self, status, categories, pageTitle)

master/buildbot/status/web/grid.py

@@ -21,7 +21,7 @@
 class ANYBRANCH: pass # a flag value, used below
 
 class GridStatusMixin(object):
-    def getTitle(self, request):
+    def getPageTitle(self, request):
         status = self.getStatus(request)
         p = status.getTitle()
         if p:

master/buildbot/status/web/logs.py

@@ -107,7 +107,7 @@ def render_GET(self, req):
             self.template = req.site.buildbot_service.templates.get_template("logs.html")                
 
             data = self.template.module.page_header(
-                    title = "Log File contents",
+                    pageTitle = "Log File contents",
                     texturl = req.childLink("text"),
                     path_to_root = path_to_root(req))
             data = data.encode('utf-8')                   

master/buildbot/status/web/olpb.py

@@ -28,7 +28,7 @@ class OneLinePerBuild(HtmlResource, BuildLineMixin):
     reload=: reload the page after this many seconds
     """
 
-    title = "Recent Builds"
+    pageTitle = "Recent Builds"
 
     def __init__(self, numbuilds=20):
         HtmlResource.__init__(self)
@@ -97,7 +97,7 @@ def __init__(self, builder, numbuilds=20):
         self.builder = builder
         self.builder_name = builder.getName()
         self.numbuilds = numbuilds
-        self.title = "Recent Builds of %s" % self.builder_name
+        self.pageTitle = "Recent Builds of %s" % self.builder_name
 
     def content(self, req, cxt):
         numbuilds = int(req.args.get("numbuilds", [self.numbuilds])[0])

master/buildbot/status/web/root.py

@@ -19,7 +19,7 @@
 from buildbot.util.eventual import eventually
 
 class RootPage(HtmlResource):
-    title = "Buildbot"
+    pageTitle = "Buildbot"
 
     def content(self, request, cxt):
         status = self.getStatus(request)

master/buildbot/status/web/slaves.py

@@ -30,7 +30,7 @@ def __init__(self, slavename):
         HtmlResource.__init__(self)
         self.slavename = slavename
 
-    def getTitle(self, req):
+    def getPageTitle(self, req):
         return "Buildbot: %s" % self.slavename
 
     def getChild(self, path, req):
@@ -98,7 +98,7 @@ def content(self, request, ctx):
 
 # /buildslaves
 class BuildSlavesResource(HtmlResource):
-    title = "BuildSlaves"
+    pageTitle = "BuildSlaves"
     addSlash = True
 
     def content(self, request, ctx):