changeset 1353:4a71075e6d39

Merge with main.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Sun, 20 Aug 2006 17:29:00 +0200
parents dfed953d5e9f (current diff) 36dec228a83f (diff)
children c9dd061b932c 8bf6e48c6236
files
diffstat 4 files changed, 8 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/info.py	Sun Aug 20 17:27:56 2006 +0200
+++ b/MoinMoin/action/info.py	Sun Aug 20 17:29:00 2006 +0200
@@ -197,7 +197,6 @@
     # main function
     _ = request.getText
     page = Page(request, pagename)
-    qpagename = wikiutil.quoteWikinameURL(pagename)
     title = page.split_title(request)
 
     request.emit_http_headers()
--- a/MoinMoin/macro/WantedPages.py	Sun Aug 20 17:27:56 2006 +0200
+++ b/MoinMoin/macro/WantedPages.py	Sun Aug 20 17:29:00 2006 +0200
@@ -23,13 +23,9 @@
 
     # Control bar - filter the list of pages
     # TODO: we should make this a widget and use on all page listing pages
-    controlbar = '''<div class="controlbar">
-<a href="%(qpagename)s?allpages=%(allpages)d">%(label)s</a>
-</div>''' % {
-        'qpagename': wikiutil.quoteWikinameURL(macro.formatter.page.page_name),
-        'allpages': not allpages,
-        'label': (_('Include system pages'), _('Exclude system pages'))[allpages],
-    }
+    label = (_('Include system pages'), _('Exclude system pages'))[allpages]
+    page = macro.formatter.page
+    controlbar = '<div class="controlbar">%s</div>' % page.link_to(request, label, querystr={'allpages': '%d' % allpages and '0' or '1'})
 
     # Get page dict readable by current user
     pages = request.rootpage.getPageDict()
--- a/MoinMoin/macro/__init__.py	Sun Aug 20 17:27:56 2006 +0200
+++ b/MoinMoin/macro/__init__.py	Sun Aug 20 17:29:00 2006 +0200
@@ -245,11 +245,10 @@
             links = [letter_link(letter) for letter in index_letters]
             return "<p>%s%s</p>" % (' | '.join(links), additional_html)
 
-        qpagename = wikiutil.quoteWikinameURL(self.formatter.page.page_name)
+        page = self.formatter.page
         allpages_txt = (_('Include system pages'), _('Exclude system pages'))[allpages]
-        index = _make_index_key(index_letters, u"""<br>
-<a href="%s?allpages=%d">%s</a>
-""" % (qpagename, not allpages, allpages_txt) )
+        allpages_link = page.link_to(self.request, allpages_txt, querystr={'allpages': allpages and '0' or '1'})
+        index = _make_index_key(index_letters, u'<br>%s' % allpages_link)
         # ?action=titleindex and ?action=titleindex&mimetype=text/xml removed
 
         return u'%s%s' % (index, u''.join(html))
--- a/MoinMoin/theme/__init__.py	Sun Aug 20 17:27:56 2006 +0200
+++ b/MoinMoin/theme/__init__.py	Sun Aug 20 17:29:00 2006 +0200
@@ -183,9 +183,8 @@
         """
         html = u''
         if self.cfg.logo_string:
-            pagename = wikiutil.getFrontPage(self.request).page_name
-            pagename = wikiutil.quoteWikinameURL(pagename)
-            logo = wikiutil.link_tag(self.request, pagename, self.cfg.logo_string)
+            page = wikiutil.getFrontPage(self.request)
+            logo = page.link_to_raw(self.request, self.cfg.logo_string)
             html = u'''<div id="logo">%s</div>''' % logo
         return html