X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=plugin%2Ftheme%2Fsite.py;h=e58d273fb55e27efad6abed19b718313cf56658d;hb=422955d9165ac9d502c25e581d84045874835728;hp=91c4c262a95dceb5abe19a7bdb8e00ba2ed2807d;hpb=6ae7e3384b4e4a1b310984b146911fb3c4569ee1;p=matthijs%2Fprojects%2Fwipi.git
diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index 91c4c26..e58d273 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):
@@ -45,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)
@@ -81,15 +83,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)
@@ -104,8 +107,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,10 +115,12 @@ class SiteTheme(ThemeBase):
# Footer
u'',
# Post footer custom html
@@ -125,7 +129,7 @@ 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
@@ -144,6 +148,42 @@ class SiteTheme(ThemeBase):
return html
+ def theme_script(self, name):
+ """ Format script html from this theme's static dir """
+ src = '%s/%s/js/%s.js' % (self.request.cfg.url_prefix_static, self.name, name)
+ return '' % src
+
+ def pageinfo(self, page):
+ """ Output page name and "last modified". This overwrites the pageinfo
+ from ThemeBase to hide the username, which is useless and always
+ produces a link to the non-existing homepage of the last editor. """
+ _ = self.request.getText
+ html = ''
+ if self.shouldShowPageinfo(page):
+ info = page.lastEditInfo()
+ if info:
+ info = _("last modified %(time)s") % info
+ pagename = page.page_name
+ info = "%s (%s)" % (wikiutil.escape(pagename), info)
+ html = '%(info)s
\n' % {
+ 'lang': self.ui_lang_attr(),
+ 'info': info
+ }
+ return 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):
"""
Generate and return a theme object
@@ -154,3 +194,4 @@ def execute(request):
"""
return Theme(request)
+# vim: set sw=4 sts=4 expandtab: