Reorder some stuff in the site theme.

Some things are shown differently, some things are hidden, and we add a
function for custom, per-theme javascript that was required for the previous
commit.

diff --git a/plugin/theme/site.py b/plugin/theme/site.py
index 91c4c262a95dceb5abe19a7bdb8e00ba2ed2807d..3744a1c15b4f52ec040bf81cccc69327f2480c12 100644 (file)
--- a/plugin/theme/site.py
+++ b/plugin/theme/site.py
@@ -52,12 +52,10 @@ class SiteTheme(ThemeBase):
             #self.interwiki(d),
             #self.title(d),
             #u'</div>',
             #self.interwiki(d),
             #self.title(d),
             #u'</div>',

-            self.navibar(d),
+            #self.navibar(d),

             #u'<hr id="pageline">',
             #u'<div id="pageline"><hr style="display:none;"></div>',
             #u'<hr id="pageline">',
             #u'<div id="pageline"><hr style="display:none;"></div>',

-            self.msg(d),
-            self.editbar(d),
-            self.trail(d),
+            ##self.trail(d),

             u'</div>',
 
             # Post header custom html (not recommended)
             u'</div>',
 
             # Post header custom html (not recommended)


@@ -65,6 +63,7 @@ class SiteTheme(ThemeBase):
 
             # Start of page
             self.startPage(),
 
             # Start of page
             self.startPage(),

+            self.msg(d),

         ]
         return u'\n'.join(html)
 
         ]
         return u'\n'.join(html)
 


@@ -81,8 +80,7 @@ class SiteTheme(ThemeBase):
 
             # Header
             u'<div id="header">',
 
             # Header
             u'<div id="header">',

-            self.title(d),
-            self.msg(d),
+            self.menu(d),

             u'</div>',
 
             # Post header custom html (not recommended)
             u'</div>',
 
             # Post header custom html (not recommended)


@@ -90,6 +88,7 @@ class SiteTheme(ThemeBase):
 
             # Start of page
             self.startPage(),
 
             # Start of page
             self.startPage(),

+            self.msg(d),

         ]
         return u'\n'.join(html)
 
         ]
         return u'\n'.join(html)
 


@@ -112,8 +111,9 @@ class SiteTheme(ThemeBase):
 
             # Footer
             u'<div id="footer">',
 
             # Footer
             u'<div id="footer">',

-            self.username(d),

             self.searchform(d),
             self.searchform(d),

+            self.username(d),
+            self.editbar(d),

             #self.editbar(d),
             #self.credits(d),
             #self.showversion(d, **keywords),
             #self.editbar(d),
             #self.credits(d),
             #self.showversion(d, **keywords),


@@ -125,7 +125,7 @@ class SiteTheme(ThemeBase):
         return u'\n'.join(html)
 
     def menu(self, d):
         return u'\n'.join(html)
 
     def menu(self, d):

-        """ Assemble a "main menu
+        """ Assemble a "main" menu

             
             @param d: parameter dictionary
             @rtype:   unicode
             
             @param d: parameter dictionary
             @rtype:   unicode


@@ -144,6 +144,11 @@ class SiteTheme(ThemeBase):
 
         return html
 
 
         return html
 

+    def theme_script(self, name):
+        """ Format script html from this theme's static dir """
+        src = '%s/%s/js/%s.js' % (self.request.cfg.url_prefix_static, self.name, name)
+        return '<script type="text/javascript" src="%s"></script>' % src
+

 def execute(request):
     """
     Generate and return a theme object
 def execute(request):
     """
     Generate and return a theme object