From: Fredrik Tolf Date: Thu, 5 Jul 2012 00:20:17 +0000 (+0200) Subject: Handle skeleton transformation more flexibly. X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=3162cb89d51c4df9eec6c979d20bc4a2c82da5f9;p=wrw.git Handle skeleton transformation more flexibly. --- diff --git a/wrw/resp.py b/wrw/resp.py index 9ad22d1..24896ba 100644 --- a/wrw/resp.py +++ b/wrw/resp.py @@ -5,17 +5,17 @@ h = xhtml.cons() __all__ = ["skeleton", "skelfor", "setskel", "usererror"] class skeleton(object): - def page(self, title, *content): - return h.html(self.head(title), h.body(*content)) + def page(self, req, title, *content): + return xhtml.forreq(req, h.html(self.head(req, title), h.body(*content))) - def head(self, title): + def head(self, req, title): return xhtml.head(title=title) - def error(self, message, *detail): - return self.page(message, h.h1(message), h.p(*detail)) + def error(self, req, message, *detail): + return self.page(req, message, h.h1(message), h.p(*detail)) - def message(self, message, *detail): - return self.page(message, h.h1(message), h.p(*detail)) + def message(self, req, message, *detail): + return self.page(req, message, h.h1(message), h.p(*detail)) defskel = env.var(skeleton()) @@ -33,7 +33,7 @@ class usererror(dispatch.restart): self.detail = detail def handle(self, req): - return xhtml.forreq(req, skelfor(req).error(self.message, *self.detail)) + return skelfor(req).error(req, self.message, *self.detail) class message(dispatch.restart): def __init__(self, msg, *detail): @@ -42,7 +42,7 @@ class message(dispatch.restart): self.detail = detail def handle(self, req): - return xhtml.forreq(req, skelfor(req).error(self.message, *self.detail)) + return skelfor(req).error(req, self.message, *self.detail) class httperror(usererror): def __init__(self, status, message = None, detail = None):