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

diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index e934485..21d8aa6 100644
--- a/plugin/theme/site.py
+++ b/plugin/theme/site.py
@@ -10,6 +10,7 @@
 """
 
 from MoinMoin.theme import ThemeBase
+from MoinMoin.Page import Page
 
 class SiteTheme(ThemeBase):
 
@@ -38,19 +39,19 @@ class SiteTheme(ThemeBase):
 
             # Header
             u'<div id="header">',
+            self.menu(d),
             #self.logo(),
-            self.searchform(d),
             #self.username(d),
-            u'<div id="locationline">',
+            #u'<div id="locationline">',
             #self.interwiki(d),
-            self.title(d),
-            u'</div>',
-            self.trail(d),
-            #self.navibar(d),
+            #self.title(d),
+            #u'</div>',
+            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),
             u'</div>',
 
             # Post header custom html (not recommended)
@@ -106,6 +107,7 @@ class SiteTheme(ThemeBase):
             # Footer
             u'<div id="footer">',
             self.username(d),
+            self.searchform(d),
             #self.editbar(d),
             #self.credits(d),
             #self.showversion(d, **keywords),
@@ -116,6 +118,25 @@ class SiteTheme(ThemeBase):
             ]
         return u'\n'.join(html)
 
+    def menu(self, d):
+        """ Assemble a "main menu
+            
+            @param d: parameter dictionary
+            @rtype:   unicode
+            @return: menu html
+        """
+        items = Page(self.request, 'Site/Menu').data.split('\n')
+        
+        html = '<ul id="menubar">'
+
+        for item in items:
+            if (not item.startswith("#")):
+                (pagename, link) = self.splitNavilink(item)
+                html = html + ("<li class=\"menulink\">%s</li>" % link)
+        
+        html = html + '</ul>'
+
+        return html
 
 def execute(request):
     """