X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=plugin%2Ftheme%2Fsite.py;h=c190efb1b8ffd00411b288d45d7f07f098335df7;hb=0127eba7013cb8c91a20dbea213482ac9fd32921;hp=17f4bfe3125c92fde5c203c93e3b85c6c49490f2;hpb=bca7a535d5c77b71a60e5f535db8b6f8116ca698;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index 17f4bfe..c190efb 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),
@@ -83,6 +83,7 @@ class SiteTheme(ThemeBase):
 
             # Header
             u'<div id="header">',
+            self.logo(),
             self.menu(d),
             u'</div>',
 
@@ -170,20 +171,16 @@ class SiteTheme(ThemeBase):
         return html
 
     def startPage(self, d):
+        # This opens up #page
         html = ThemeBase.startPage(self)
-        if d['page'].page_name != 'Site':
-            html += u'<div id="pagetop"></div>\n'
-            html += u'<div id="pagemiddle">'
+        html += u'<div id="pagetop"></div>\n'
+        html += u'<div id="pagemiddle">\n'
         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)
+        html = u'</div><!-- #pagemiddle -->\n'
+        html += ThemeBase.endPage(self)
+        # This adds #pagebottom and closes #page
         return html
 
 def execute(request):