X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=plugin%2Ftheme%2Fsite.py;h=e3288c21a0e0e74aac695ebd8a4047dbeaf8f736;hb=60b94304e6f704ae567056a9b8b41a7c2806f84e;hp=21d8aa66c017d01608a633a9b5e0cdaf3a97b65c;hpb=eabeb1ba9c789101478caee6146ab1a0760afed5;p=matthijs%2Fprojects%2Fwipi.git diff --git a/plugin/theme/site.py b/plugin/theme/site.py index 21d8aa6..e3288c2 100644 --- a/plugin/theme/site.py +++ b/plugin/theme/site.py @@ -11,6 +11,7 @@ from MoinMoin.theme import ThemeBase from MoinMoin.Page import Page +from MoinMoin import wikiutil class SiteTheme(ThemeBase): @@ -25,6 +26,12 @@ class SiteTheme(ThemeBase): return ThemeBase.searchform(self, d) else: return '' + + def navibar(self, d): + if self.request.user.valid: + return ThemeBase.navibar(self, d) + else: + return '' def header(self, d, **kw): """ Assemble wiki header @@ -39,26 +46,27 @@ class SiteTheme(ThemeBase): # Header u'', # Post header custom html (not recommended) self.emit_custom_html(self.cfg.page_header2), + self.msg(d), + self.editbar(d), + # Start of page - self.startPage(), + self.startPage(d), ] return u'\n'.join(html) @@ -75,15 +83,15 @@ class SiteTheme(ThemeBase): # Header u'', # Post header custom html (not recommended) self.emit_custom_html(self.cfg.page_header2), # Start of page - self.startPage(), + self.startPage(d), + self.msg(d), ] return u'\n'.join(html) @@ -98,8 +106,7 @@ class SiteTheme(ThemeBase): page = d['page'] html = [ # End of page - self.pageinfo(page), - self.endPage(), + self.endPage(d), # Pre footer custom html (not recommended!) self.emit_custom_html(self.cfg.page_footer1), @@ -107,6 +114,7 @@ class SiteTheme(ThemeBase): # Footer u'