edit bar and other changes + latest debian.css

[deb/moinmoin.git] / theme / debwiki.py

diff --git a/theme/debwiki.py b/theme/debwiki.py
index 5529bb30c7e3f1f148198e58c1b7b978cd65abda..5ef31e91a7596729d9ba3859c0457c3134be653d 100644 (file)
--- a/theme/debwiki.py
+++ b/theme/debwiki.py
@@ -1,10 +1,9 @@
 # -*- coding: iso-8859-1 -*-
 """
-    MoinMoin - Debian theme
+    MoinMoin - modern theme
 
     @copyright: 2003-2005 Nir Soffer, Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
-       theme modified by Kalle Soderman
 """
 
 from MoinMoin.theme import ThemeBase
@@ -92,28 +91,27 @@ class Theme(ThemeBase):
 
             # Header
             u'<div id="header">',
-            self.searchform(d),
-            #self.logo(),
-            u'<div id="domaintools"><p class="section">Wiki</p>',
+                       u'<div id="wikisection">',
+                       u'<p class="section"><a href="/" title="Debian Wiki Homepage">Wiki</a></p>',
             self.username(d),
-            u'</div>',
-            u'<div id="navbar">',
+                       u'</div>',
+                       u'<div id="navbar">',
             self.navibar(d),
-            u'</div>',
-            u'<div id="breadcrumbs">',
-            u'<a href="/" title="Wiki Homepage">Wiki</a><span class="sep">/</span>',
-            #self.interwiki(d),
-            self.title(d),
-            u'</div>',
-
-            #self.trail(d),
+                       u'</div>',
+            self.searchform(d),
+            self.logo(),
+            self.interwiki(d),
+                       #u'<a href="/" title="wiki home">Wiki</a> / ',
+                       u'<div id="breadcrumbs"><a href="/" title="Debian Wiki Homepage">Wiki</a><span class="sep">/</span>',self.trail(d),
+                       u'</div>',
             #u'<hr id="pageline">',
+            #u'<div id="pageline"><hr style="display:none;"></div>',
             self.msg(d),
+            self.editbar(d),
             u'<h1 id="locationline">',
-            self.title(d),
+               self.interwiki(d),
+                       self.title_with_separators(d),
             u'</h1>',
-            u'<div id="pageline"><hr style="display:none;"></div>',
-            #self.editbar(d),
             u'</div>',
 
             # Post header custom html (not recommended)
@@ -138,7 +136,7 @@ class Theme(ThemeBase):
             # Header
             u'<div id="header">',
             u'<h1 id="locationline">',
-            self.title(d),
+            self.title_with_separators(d),
             u'</h1>',
             self.msg(d),
             u'</div>',
@@ -162,7 +160,6 @@ class Theme(ThemeBase):
         page = d['page']
         html = [
             # End of page
-            self.pageinfo(page),
             self.endPage(),
 
             # Pre footer custom html (not recommended!)
@@ -170,7 +167,8 @@ class Theme(ThemeBase):
 
             # Footer
             u'<div id="footer">',
-            self.editbar(d),
+        #    self.editbar(d),
+            self.pageinfo(page),
             self.credits(d),
             self.showversion(d, **keywords),
             u'</div>',
@@ -180,39 +178,6 @@ class Theme(ThemeBase):
             ]
         return u'\n'.join(html)
 
-    def title(self, d):
-        """ Assemble the title (now using breadcrumbs)
-
-        @param d: parameter dictionary
-        @rtype: string
-        @return: title html
-        """
-        _ = self.request.getText
-        content = []
-        if d['title_text'] == d['page'].split_title(): # just showing a page, no action
-            curpage = ''
-            segments = d['page_name'].split('/') # was: title_text
-            for s in segments[:-1]:
-                curpage += s
-                content.append(Page(self.request, curpage).link_to(self.request, s))
-                curpage += '/'
-            link_text = segments[-1]
-            link_title = _('Click to do a full-text search for this title')
-            link_query = {
-                'action': 'fullsearch',
-                'value': 'linkto:"%s"' % d['page_name'],
-                'context': '180',
-            }
-            # we dont use d['title_link'] any more, but make it ourselves:
-            link = d['page'].link_to(self.request, link_text, querystr=link_query, title=link_title, css_class='backlink', rel='nofollow')
-            content.append(link)
-        else:
-            content.append(wikiutil.escape(d['title_text']))
-
-        location_html = u'<span class="sep">/</span>'.join(content)
-        html = u'<span id="pagelocation">%s</span>' % location_html
-        return html
-
     def username(self, d):
         """ Assemble the username / userprefs link
 
@@ -293,7 +258,7 @@ class Theme(ThemeBase):
                     title = self.shortenPagename(title)
                     link = page.link_to(request, title)
                     items.append(link)
-                html = u'<div id="pagetrail">%s</div>' % u'<span class="sep">/</span>'.join(items)
+                html = u'<div id="pagetrail">%s</div>'% u'<span class="sep">/</span>'.join(items)
         return html
 
     def interwiki(self, d):