- def page(self, title, content):
- return """<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
-<head>
-%s
-</head>
-<body>
-%s
-</body>
-</html>""" % (self.head(title), content)
-
- def head(self, title):
- return """<title>%s</title>\n%s""" % (title, self.style())
-
- def style(self):
- return ""
-
- def error(self, message, detail):
- return self.page(message, """<h1>%s</h1>\n<p>%s</p>\n""" % (message, detail))
-
- def message(self, message, detail):
- return self.page(message, """<h1>%s</h1>\n<p>%s</p>\n""" % (message, detail))
+ def page(self, req, title, *content):
+ return xhtml.forreq(req, h.html(self.head(req, title), h.body(*content)))
+
+ def head(self, req, title):
+ return xhtml.head(title=title)
+
+ def error(self, req, message, *detail):
+ return self.page(req, message, h.h1(message), h.p(*detail))
+
+ def message(self, req, message, *detail):
+ return self.page(req, message, h.h1(message), h.p(*detail))