Made footer into template + minor cleanup

buildbot/status/web/about.py

@@ -15,5 +15,4 @@ def body(self, request):
                                twisted=twisted.__version__,
                                jinja=jinja2.__version__, 
                                python=sys.version,
-                               platform=sys.platform);
-
+                               platform=sys.platform)

buildbot/status/web/base.py

@@ -275,13 +275,13 @@ def getControl(self, request):
         return request.site.buildbot_service.getControl()
 
     def isUsingUserPasswd(self, request):
-	return request.site.buildbot_service.isUsingUserPasswd()
+        return request.site.buildbot_service.isUsingUserPasswd()
 
     def authUser(self, request):
-	user = request.args.get("username", ["<unknown>"])[0]
-	passwd = request.args.get("passwd", ["<no-password>"])[0]
-	if user == "<unknown>" or passwd == "<no-password>":
-	    return False
+        user = request.args.get("username", ["<unknown>"])[0]
+        passwd = request.args.get("passwd", ["<no-password>"])[0]
+        if user == "<unknown>" or passwd == "<no-password>":
+            return False
         return request.site.buildbot_service.authUser(user, passwd)
 
     def getChangemaster(self, request):
@@ -291,32 +291,13 @@ def path_to_root(self, request):
         return path_to_root(request)
 
     def footer(self, s, req):
-        # TODO: this stuff should be generated by a template of some sort
-        projectURL = s.getProjectURL()
-        projectName = s.getProjectName()
-        data = '<hr /><div class="footer">\n'
-
-        welcomeurl = self.path_to_root(req) + "index.html"
-        data += '[<a href="%s">welcome</a>]\n' % welcomeurl
-        data += "<br />\n"
-
-        data += '<a href="http://buildbot.sourceforge.net/">Buildbot</a>'
-        data += "-%s " % version
-        if projectName:
-            data += "working for the "
-            if projectURL:
-                data += "<a href=\"%s\">%s</a> project." % (projectURL,
-                                                            projectName)
-            else:
-                data += "%s project." % projectName
-        data += "<br />\n"
-        data += ("Page built: " +
-                 time.strftime("%a %d %b %Y %H:%M:%S",
-                               time.localtime(util.now()))
-                 + "\n")
-        data += '</div>\n'
-
-        return data
+        template = env.get_template("footer.html")
+        return template.render(projectURL = s.getProjectURL(),
+                               projectName = s.getProjectName(),
+                               welcomeurl = self.path_to_root(req) + "index.html",
+                               version = version,
+                               time = time.strftime("%a %d %b %Y %H:%M:%S",
+                                                    time.localtime(util.now())))
 
     def getTitle(self, request):
         return self.title

buildbot/status/web/templates/about.html

@@ -5,8 +5,8 @@ <h2>Version Information</h2>
  <li>Buildbot: {{ buildbot }}</li>
  <li>Twisted: {{ twisted }}</li>
  <li>Jinja: {{ jinja }}</li>
- <li>Python: {{ python}}</li>
- <li>Buildmaster platform: {{ platform}}</li>
+ <li>Python: {{ python }}</li>
+ <li>Buildmaster platform: {{ platform }}</li>
 
 </ul>
 

buildbot/status/web/templates/footer.html

@@ -0,0 +1,23 @@
+<hr />
+<div class="footer">
+
+<a href="{{ welcomeurl }}">welcome</a>
+<br />
+
+<a href="http://buildbot.sourceforge.net/">Buildbot</a>-{{ version }}
+
+{% if projectName %}
+  working for the
+  {% if projectURL %}
+    <a href="{{ projectURL }}>{{ projectName }}</a>
+  {% else %}
+    {{ projectName }}
+  {% end if %}
+  project
+{% end if %}
+
+<br />
+
+Page built: {{ time }}
+</div>
+