X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=plugin%2Ftheme%2Fexodus.py;h=5a27ef5023541eccb67d398c0dff6d235ae26868;hb=dc5446c2a78824316454d2d14102b010bf013f61;hp=479a258c31c52ce7858eaddbe5fb070f30b3904b;hpb=f9748f538ba339b0f52c22266614247d1a412419;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/plugin/theme/exodus.py b/plugin/theme/exodus.py
index 479a258..5a27ef5 100644
--- a/plugin/theme/exodus.py
+++ b/plugin/theme/exodus.py
@@ -1,4 +1,3 @@
-# -*- coding: iso-8859-1 -*-
 """
     MoinMoin - modern theme
 
@@ -6,115 +5,23 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-from MoinMoin.theme import ThemeBase
+from site import SiteTheme
 
-class Theme(ThemeBase):
+class Theme(SiteTheme):
 
     name = "exodus"
 
-    def editbar(self, d):
-        if self.request.user.valid:
-            return ThemeBase.editbar(self, d)
-        else:
-            return ''
-
-    def searchform(self, d):
-        if self.request.user.valid:
-            return ThemeBase.searchform(self, d)
-        else:
-            return ''
-
-    def header(self, d, **kw):
-        """ Assemble wiki header
-        
-        @param d: parameter dictionary
-        @rtype: unicode
-        @return: page header html
-        """
+    def html_head(self, d):
         html = [
-            # Pre header custom html
-            self.emit_custom_html(self.cfg.page_header1),
-
-            # Header
-            u'<div id="header">',
-            #self.logo(),
-            self.searchform(d),
-            #self.username(d),
-            u'<div id="locationline">',
-            #self.interwiki(d),
-            self.title(d),
-            u'</div>',
-            self.trail(d),
-            #self.navibar(d),
-            #u'<hr id="pageline">',
-            #u'<div id="pageline"><hr style="display:none;"></div>',
-            self.msg(d),
-            self.editbar(d),
-            u'</div>',
-
-            # Post header custom html (not recommended)
-            self.emit_custom_html(self.cfg.page_header2),
-
-            # Start of page
-            self.startPage(),
+            SiteTheme.html_head(self, d),
+            #self.theme_script('jquery-1.3.2.min'),
+            self.theme_script('jquery-1.3.2'),
         ]
-        return u'\n'.join(html)
-
-    def editorheader(self, d, **kw):
-        """ Assemble wiki header for editor
-        
-        @param d: parameter dictionary
-        @rtype: unicode
-        @return: page header html
-        """
-        html = [
-            # Pre header custom html
-            self.emit_custom_html(self.cfg.page_header1),
-
-            # Header
-            u'<div id="header">',
-            self.title(d),
-            self.msg(d),
-            u'</div>',
-
-            # Post header custom html (not recommended)
-            self.emit_custom_html(self.cfg.page_header2),
-
-            # Start of page
-            self.startPage(),
-        ]
-        return u'\n'.join(html)
-
-    def footer(self, d, **keywords):
-        """ Assemble wiki footer
-        
-        @param d: parameter dictionary
-        @keyword ...:...
-        @rtype: unicode
-        @return: page footer html
-        """
-        page = d['page']
-        html = [
-            # End of page
-            self.pageinfo(page),
-            self.endPage(),
-
-            # Pre footer custom html (not recommended!)
-            self.emit_custom_html(self.cfg.page_footer1),
-
-            # Footer
-            u'<div id="footer">',
-            self.username(d),
-            #self.editbar(d),
-            #self.credits(d),
-            #self.showversion(d, **keywords),
-            u'</div>',
-
-            # Post footer custom html
-            self.emit_custom_html(self.cfg.page_footer2),
-            ]
-        return u'\n'.join(html)
+        if d['page'].page_name == 'Site':
+            html.append(self.theme_script('homepage'))
+            html.append(self._stylesheet_link(True, 'screen', 'home'))
 
+        return '\n'.join(html)
 
 def execute(request):
     """
@@ -126,3 +33,4 @@ def execute(request):
     """
     return Theme(request)
 
+# vim: set sw=4 sts=4 expandtab: