X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=plugin%2Ftheme%2Fsite.py;h=17f4bfe3125c92fde5c203c93e3b85c6c49490f2;hb=5f0141b70611206786cad421c7c395ced3a426be;hp=91c4c262a95dceb5abe19a7bdb8e00ba2ed2807d;hpb=6ae7e3384b4e4a1b310984b146911fb3c4569ee1;p=matthijs%2Fprojects%2Fwipi.git
diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index 91c4c26..17f4bfe 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):
@@ -52,19 +53,20 @@ class SiteTheme(ThemeBase):
#self.interwiki(d),
#self.title(d),
#u'',
- self.navibar(d),
+ #self.navibar(d),
#u'
',
#u'
',
- self.msg(d),
- self.editbar(d),
- self.trail(d),
+ ##self.trail(d),
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)
@@ -81,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)
@@ -104,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),
@@ -113,6 +114,7 @@ class SiteTheme(ThemeBase):
# Footer
u''
+ else:
+ html = u''
+ #html += ThemeBase.endPage(self)
+ return html
+
def execute(request):
"""
Generate and return a theme object
@@ -154,3 +196,4 @@ def execute(request):
"""
return Theme(request)
+# vim: set sw=4 sts=4 expandtab: