X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=plugin%2Ftheme%2Fsite.py;h=226680ba6dbcb6a39c6f2dc9a86ebac326f681b7;hb=12b46399c84b4b2d3077483fbe3528653b3e217c;hp=21d8aa66c017d01608a633a9b5e0cdaf3a97b65c;hpb=eabeb1ba9c789101478caee6146ab1a0760afed5;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index 21d8aa6..226680b 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,7 @@
 
 from MoinMoin.theme import ThemeBase
 from MoinMoin.Page import Page
+from MoinMoin import wikiutil
 
 class SiteTheme(ThemeBase):
 
@@ -25,6 +29,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 +49,27 @@ class SiteTheme(ThemeBase):
 
             # Header
             u'<div id="header">',
+            self.logo(),
             self.menu(d),
-            #self.logo(),
             #self.username(d),
             #u'<div id="locationline">',
             #self.interwiki(d),
             #self.title(d),
             #u'</div>',
-            self.navibar(d),
+            #self.navibar(d),
             #u'<hr id="pageline">',
             #u'<div id="pageline"><hr style="display:none;"></div>',
-            self.msg(d),
-            self.editbar(d),
-            self.trail(d),
+            ##self.trail(d),
             u'</div>',
 
             # 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 +86,16 @@ class SiteTheme(ThemeBase):
 
             # Header
             u'<div id="header">',
-            self.title(d),
-            self.msg(d),
+            self.logo(),
+            self.menu(d),
             u'</div>',
 
             # 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 +110,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 +118,12 @@ class SiteTheme(ThemeBase):
             # Footer
             u'<div id="footer">',
             self.username(d),
+            self.pageinfo(page),
             self.searchform(d),
             #self.editbar(d),
             #self.credits(d),
             #self.showversion(d, **keywords),
+            u'<div id="footerbottom"></div>',
             u'</div>',
 
             # Post footer custom html
@@ -119,7 +132,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
@@ -138,13 +151,40 @@ class SiteTheme(ThemeBase):
 
         return html
 
-def execute(request):
-    """
-    Generate and return a theme object
-        
-    @param request: the request object
-    @rtype: MoinTheme
-    @return: Theme object
-    """
-    return Theme(request)
+    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 '<script type="text/javascript" src="%s"></script>' % 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 = '<p id="pageinfo" class="info"%(lang)s>%(info)s</p>\n' % {
+                    'lang': self.ui_lang_attr(),
+                    'info': info
+                    }
+        return html
+
+    def startPage(self, d):
+        # This opens up #page
+        html = ThemeBase.startPage(self)
+        html += u'<div id="pagetop"></div>\n'
+        html += u'<div id="pagemiddle">\n'
+        return html
+
+    def endPage(self, d):
+        html = u'</div><!-- #pagemiddle -->\n'
+        html += ThemeBase.endPage(self)
+        # This adds #pagebottom and closes #page
+        return html
 
+# vim: set sw=4 sts=4 expandtab: