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

diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index 37bff91..683272d 100644
--- a/plugin/theme/site.py
+++ b/plugin/theme/site.py
@@ -46,8 +46,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 +62,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)
 
@@ -89,7 +90,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 +106,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),
@@ -168,6 +169,23 @@ class SiteTheme(ThemeBase):
                     }
         return html
 
+    def startPage(self, d):
+        html = ThemeBase.startPage(self)
+        if d['page'].page_name != 'Site':
+            html += u'<div id="pagetop"></div>\n'
+            html += u'<div id="pagemiddle">'
+        return html
+
+    def endPage(self, d):
+        if d['page'].page_name != 'Site':
+            html = u'</div><!-- #pagemiddle -->'
+            html += u'<div id=pagebottom></div>'
+            html += u'</div>'
+        else:
+            html = u'</div>'
+        #html += ThemeBase.endPage(self)
+        return html
+
 def execute(request):
     """
     Generate and return a theme object