X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=plugin%2Ftheme%2Fsite.py;h=683272d6d62ed27922467ecdff212fcf841569c3;hb=691070c8beafc156a31c60a10ce00e39354fdb90;hp=e9344851be65d92f702aa69a199296f8e569cbaf;hpb=de9df7d614654bfc9399dfd3055a03833ab51f48;p=matthijs%2Fprojects%2Fwipi.git
diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index e934485..683272d 100644
--- a/plugin/theme/site.py
+++ b/plugin/theme/site.py
@@ -10,6 +10,8 @@
"""
from MoinMoin.theme import ThemeBase
+from MoinMoin.Page import Page
+from MoinMoin import wikiutil
class SiteTheme(ThemeBase):
@@ -24,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
@@ -38,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)
@@ -74,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)
@@ -97,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),
@@ -106,6 +114,8 @@ class SiteTheme(ThemeBase):
# Footer
u''
+ else:
+ html = u''
+ #html += ThemeBase.endPage(self)
+ return html
def execute(request):
"""
@@ -127,3 +196,4 @@ def execute(request):
"""
return Theme(request)
+# vim: set sw=4 sts=4 expandtab: