changeset 5200:a3c6d7b7a5dd

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 10 Oct 2009 13:35:26 +0200
parents 1992db92a230 (current diff) 051c7d3deecf (diff)
children c5244b636870 8b2c738f2a91
files
diffstat 3 files changed, 29 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/RenamePage.py	Sat Oct 10 13:35:03 2009 +0200
+++ b/MoinMoin/action/RenamePage.py	Sat Oct 10 13:35:26 2009 +0200
@@ -83,7 +83,7 @@
 
             d = {
                 'subpage': subpages,
-                'subpages_checked': ('', 'checked')[self.request.form.get('subpages_checked', '0') == '1'],
+                'subpages_checked': ('', 'checked')[self.request.values.get('subpages_checked', '0') == '1'],
                 'subpage_label': _('Rename all /subpages too?'),
                 'pagename': wikiutil.escape(self.pagename, True),
                 'newname_label': _("New name"),
--- a/MoinMoin/i18n/strings.py	Sat Oct 10 13:35:03 2009 +0200
+++ b/MoinMoin/i18n/strings.py	Sat Oct 10 13:35:26 2009 +0200
@@ -103,6 +103,12 @@
 # Installation / Configuration / Administration Help:
 admin_pages = [
     _('InstallDocs'),
+    _('InstallDocs/QuickInstall'),
+    _('InstallDocs/QuickInstall/Linux'),
+    _('InstallDocs/QuickInstall/MacOSX'),
+    _('InstallDocs/QuickInstall/Windows'),
+    _('InstallDocs/Requirements'),
+    _('InstallDocs/ServerInstall'),
     _('HelpOnConfiguration'),
     _('HelpOnConfiguration/EmailSupport'),
     _('HelpOnConfiguration/SecurityPolicy'),
--- a/MoinMoin/theme/__init__.py	Sat Oct 10 13:35:03 2009 +0200
+++ b/MoinMoin/theme/__init__.py	Sat Oct 10 13:35:26 2009 +0200
@@ -263,30 +263,31 @@
         @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 += '/'
+        if d['title_text'] == d['page'].split_title():
+            # just showing a page, no action
+            segments = d['page_name'].split('/')
             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)
+            link_query = { 'action': 'fullsearch', 'context': '180',
+                            'value': 'linkto:"%s"' % d['page_name'], }
+            link = d['page'].link_to(self.request, link_text,
+                                     querystr=link_query, title=link_title,
+                                     css_class='backlink', rel='nofollow')
+            if len(segments) <= 1:
+                html = link
+            else:
+                content = []
+                curpage = ''
+                for s in segments[:-1]:
+                    curpage += s
+                    content.append(Page(self.request,
+                                        curpage).link_to(self.request, s))
+                    curpage += '/'
+                path_html = u'<span class="sep">/</span>'.join(content)
+                html = u'<span class="pagepath">%s</span><span class="sep">/</span>%s' % (path_html, 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
+            html = wikiutil.escape(d['title_text'])
+        return u'<span id="pagelocation">%s</span>' % html
 
     def username(self, d):
         """ Assemble the username / userprefs link