From eabeb1ba9c789101478caee6146ab1a0760afed5 Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Wed, 26 Nov 2008 16:37:14 +0100
Subject: [PATCH] Add a menu bar to the site theme.

The contents of the menu bar are taken from the Site/Menu page.

This commit also slighty changes other aspects of the time.
---
 plugin/theme/site.py         | 33 +++++++++++++++++++++++++++------
 static/exodus/css/common.css | 18 ++++++++++++++++++
 2 files changed, 45 insertions(+), 6 deletions(-)

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):
     """
diff --git a/static/exodus/css/common.css b/static/exodus/css/common.css
index ce511fc..ad7b89d 100644
--- a/static/exodus/css/common.css
+++ b/static/exodus/css/common.css
@@ -456,5 +456,23 @@ TD.tip {
     text-align: right;
 }
 
+#menubar {
+	display: block;
+	margin-bottom: 60px;
+	margin-top: 30px;
+}
+
+#menubar li {
+	/* Hide the leading dots */
+	display: inline;
+	/* Put the menu items horizontal */
+	float: left;
+	/* Put some spacing between items */
+	padding: 0px 5px;
+	
+	font-size: +4pt;
+	font-weight: bold;
+}
+
 /* end MonthCalendar stuff */
 
-- 
2.30.2