X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fwipi.git;a=blobdiff_plain;f=plugin%2Ftheme%2Fsite.py;h=17f4bfe3125c92fde5c203c93e3b85c6c49490f2;hp=37bff91f75dc2e4b3341aa25054417f6f7bf8ab1;hb=bca7a535d5c77b71a60e5f535db8b6f8116ca698;hpb=daf3e021491abea2146754311ae0baefa8ecfead diff --git a/plugin/theme/site.py b/plugin/theme/site.py index 37bff91..17f4bfe 100644 --- a/plugin/theme/site.py +++ b/plugin/theme/site.py @@ -62,10 +62,11 @@ class SiteTheme(ThemeBase): # Post header custom html (not recommended) self.emit_custom_html(self.cfg.page_header2), - # Start of page - self.startPage(), - self.editbar(d), self.msg(d), + self.editbar(d), + + # Start of page + self.startPage(d), ] return u'\n'.join(html) @@ -89,7 +90,7 @@ class SiteTheme(ThemeBase): self.emit_custom_html(self.cfg.page_header2), # Start of page - self.startPage(), + self.startPage(d), self.msg(d), ] return u'\n'.join(html) @@ -105,7 +106,7 @@ class SiteTheme(ThemeBase): page = d['page'] html = [ # End of page - self.endPage(), + self.endPage(d), # Pre footer custom html (not recommended!) self.emit_custom_html(self.cfg.page_footer1), @@ -168,6 +169,23 @@ class SiteTheme(ThemeBase): } return html + def startPage(self, d): + html = ThemeBase.startPage(self) + if d['page'].page_name != 'Site': + html += u'
\n' + html += u'
' + return html + + def endPage(self, d): + if d['page'].page_name != 'Site': + html = u'
' + html += u'
' + html += u'' + else: + html = u'' + #html += ThemeBase.endPage(self) + return html + def execute(request): """ Generate and return a theme object