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

diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index 37bff91..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).
@@ -46,8 +49,8 @@ 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),
@@ -62,10 +65,11 @@ class SiteTheme(ThemeBase):
             # Post header custom html (not recommended)
             self.emit_custom_html(self.cfg.page_header2),
 
-            # Start of page
-            self.startPage(),
-            self.editbar(d),
             self.msg(d),
+            self.editbar(d),
+
+            # Start of page
+            self.startPage(d),
         ]
         return u'\n'.join(html)
 
@@ -82,6 +86,7 @@ class SiteTheme(ThemeBase):
 
             # Header
             u'<div id="header">',
+            self.logo(),
             self.menu(d),
             u'</div>',
 
@@ -89,7 +94,7 @@ class SiteTheme(ThemeBase):
             self.emit_custom_html(self.cfg.page_header2),
 
             # Start of page
-            self.startPage(),
+            self.startPage(d),
             self.msg(d),
         ]
         return u'\n'.join(html)
@@ -105,7 +110,7 @@ class SiteTheme(ThemeBase):
         page = d['page']
         html = [
             # End of page
-            self.endPage(),
+            self.endPage(d),
 
             # Pre footer custom html (not recommended!)
             self.emit_custom_html(self.cfg.page_footer1),
@@ -118,6 +123,7 @@ class SiteTheme(ThemeBase):
             #self.editbar(d),
             #self.credits(d),
             #self.showversion(d, **keywords),
+            u'<div id="footerbottom"></div>',
             u'</div>',
 
             # Post footer custom html
@@ -168,14 +174,17 @@ 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 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: