Mercurial > moin > 1.9

changeset 28:ef8b90110f33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
WordIndex: make systempages excludeable imported from: moin--main--1.5--patch-29
author Thomas Waldmann <tw@waldmann-edv.de>
date Sat, 24 Sep 2005 18:28:09 +0000
parents 883dd7b59979
children 8d382149e552
files MoinMoin/wikimacro.py
diffstat 1 files changed, 24 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/wikimacro.py	Sat Sep 24 18:03:54 2005 +0000
+++ b/MoinMoin/wikimacro.py	Sat Sep 24 18:28:09 2005 +0000
@@ -207,9 +207,17 @@
         return self.formatter.rawHTML(html)
 
     def _macro_WordIndex(self, args):
-        s = ''
+        _ = self._
+        allpages = int(self.form.get('allpages', [0])[0]) != 0
         # Get page list readable by current user
-        pages = self.request.rootpage.getPageList()
+        # Filter by isSystemPage if needed
+        if allpages:
+            # TODO: make this fast by caching full page list
+            pages = self.request.rootpage.getPageList()
+        else:
+            def filter(name):
+                return not wikiutil.isSystemPage(self.request, name)
+            pages = self.request.rootpage.getPageList(filter=filter)
         map = {}
         word_re = re.compile(u'[%s][%s]+' % (config.chars_upper, config.chars_lower), re.UNICODE)
         for name in pages:
@@ -223,14 +231,15 @@
         all_words = map.keys()
         all_words.sort()
         index_letters = []
-        last_letter = None
+        current_letter = None
         html = []
         for word in all_words:
-            letter = word[0]
-            if letter != last_letter:
+            letter = wikiutil.getUnicodeIndexGroup(word)
+            if letter != current_letter:
                 #html.append(self.formatter.anchordef()) # XXX no text param available!
-                html.append(u'<a name="%s">\n<h3>%s</h3>\n' % (wikiutil.quoteWikinameURL(letter), letter))
-                last_letter = letter
+                html.append(u'<a name="%s"><h3>%s</h3></a>' % (
+                    wikiutil.quoteWikinameURL(letter), letter.replace('~', 'Others')))
+                current_letter = letter
             if letter not in index_letters:
                 index_letters.append(letter)
 
@@ -242,12 +251,18 @@
             links.sort()
             last_page = None
             for name in links:
-                if name == last_page: continue
+                if name == last_page:
+                    continue
                 html.append(self.formatter.listitem(1))
                 html.append(Page(self.request, name).link_to(self.request))
                 html.append(self.formatter.listitem(0))
             html.append(self.formatter.bullet_list(0))
-        return u'%s%s' % (_make_index_key(index_letters), u''.join(html))
+        
+        qpagename = wikiutil.quoteWikinameURL(self.formatter.page.page_name)
+        index = _make_index_key(index_letters, u"""<br>
+<a href="%s?allpages=%d">%s</a>
+""" % (qpagename, not allpages, (_('Include system pages'), _('Exclude system pages'))[allpages]) )
+        return u'%s%s' % (index, u''.join(html)) 
 
 
     def _macro_TitleIndex(self, args):