X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=plugin%2Ftheme%2Fsite.py;h=c2e1659eb6dd4b155bd1769b050244319d15fea0;hb=a1d0689d8788088fa8f4356fbafca6c415ce79a2;hp=21d8aa66c017d01608a633a9b5e0cdaf3a97b65c;hpb=eabeb1ba9c789101478caee6146ab1a0760afed5;p=matthijs%2Fprojects%2Fwipi.git
diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index 21d8aa6..c2e1659 100644
--- a/plugin/theme/site.py
+++ b/plugin/theme/site.py
@@ -1,6 +1,9 @@
# -*- coding: iso-8859-1 -*-
"""
- Evolution Events, website theme
+ MoinMoin - Generic website theme.
+
+ @copyright: 2009+ Matthijs Kooijman
+ @license: GNU GPL, see COPYING for details.
This theme is meant for wiki's that are meant to function as a website,
meaning nothing fancy and wiki-ish (at least when you're not logged in).
@@ -11,6 +14,8 @@
from MoinMoin.theme import ThemeBase
from MoinMoin.Page import Page
+from MoinMoin import wikiutil
+from StringIO import StringIO
class SiteTheme(ThemeBase):
@@ -25,6 +30,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 +50,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 +87,16 @@ 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 +111,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,10 +119,12 @@ class SiteTheme(ThemeBase):
# Footer
u'',
# Post footer custom html
@@ -119,32 +133,79 @@ class SiteTheme(ThemeBase):
return u'\n'.join(html)
def menu(self, d):
- """ Assemble a "main menu
+ """ Assemble a "main" menu
@param d: parameter dictionary
@rtype: unicode
@return: menu html
"""
- items = Page(self.request, 'Site/Menu').data.split('\n')
-
- html = ''
+ def startPage(self, d):
+ # This opens up #page
+ html = ThemeBase.startPage(self)
+ html += u'\n'
+ html += u'\n'
+ return html
+ def endPage(self, d):
+ html = u'
\n'
+ html += ThemeBase.endPage(self)
+ # This adds #pagebottom and closes #page
return html
-def execute(request):
+def parse_wiki_page(request, page):
"""
- Generate and return a theme object
-
- @param request: the request object
- @rtype: MoinTheme
- @return: Theme object
- """
- return Theme(request)
+ This is an ugly hack to render a page into a string. By default,
+ formatters render using request.write automatically, which prevents us
+ from capturing the output. By disguising a StringIO buffer as a request
+ object, we manage to get at the rendered contents.
+ However, when {{{#!wiki or similar blocks are used, stuff breaks (since
+ that creates a second parser that doesn't get our StringIO buffer).
+ """
+ Parser = wikiutil.searchAndImportPlugin(request.cfg, "parser", 'wiki')
+ # Create a stringIO buffer, to capture the output
+ buffer = StringIO()
+ # Make the buffer look like the request, since the parser writes
+ # directly to the request
+ buffer.form = request.form
+ buffer.getText = request.getText
+ buffer.cfg = request.cfg
+ # Create a new formatter. Since we need to set its page, we can't use
+ # request.formatter.
+ from MoinMoin.formatter.text_html import Formatter
+ formatter = Formatter(request)
+ formatter.setPage(page)
+
+ # Create the parser and parse the page
+ parser = Parser(page.data, buffer)
+ parser.format(formatter)
+ # Return the captured buffer
+ return buffer.getvalue()
+
+# vim: set sw=4 sts=4 expandtab: