changeset 1460:44a52e7ff380

s/pages/items/g and s/include/exclude/g underlay
author Franz Pletz <fpletz AT franz-pletz DOT org>
date Wed, 23 Aug 2006 01:05:31 +0200
parents 49c65ec25f57
children 6dfca61f2672
files MoinMoin/action/fullsearch.py MoinMoin/macro/AdvancedSearch.py
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/fullsearch.py	Tue Aug 22 21:47:13 2006 +0200
+++ b/MoinMoin/action/fullsearch.py	Wed Aug 23 01:05:31 2006 +0200
@@ -71,8 +71,8 @@
         language = request.form.get('language',
                 [request.cfg.language_default])[0]
         mimetype = request.form.get('mimetype', [0])[0]
-        includeunderlay = request.form.get('includeunderlay', [0])[0]
-        nosystempages = request.form.get('nosystempages', [0])[0]
+        excludeunderlay = request.form.get('excludeunderlay', [0])[0]
+        nosystemitems = request.form.get('nosystemitems', [0])[0]
         historysearch = request.form.get('historysearch', [0])[0]
 
         mtime = request.form.get('mtime', [None])[0]
@@ -94,9 +94,9 @@
             needle += 'language:%s ' % language
         if mimetype:
             needle += 'mimetype:%s ' % mimetype
-        if not includeunderlay:
+        if excludeunderlay:
             needle += '-domain:underlay '
-        if nosystempages:
+        if nosystemitems:
             needle += '-domain:system '
         if categories:
             needle += '(%s) ' % ' or '.join(['category:%s' % cat
--- a/MoinMoin/macro/AdvancedSearch.py	Tue Aug 22 21:47:13 2006 +0200
+++ b/MoinMoin/macro/AdvancedSearch.py	Wed Aug 23 01:05:31 2006 +0200
@@ -26,7 +26,7 @@
     search_boxes = ''.join([
         f.table_row(1),
         f.table_cell(1, attrs={'rowspan': '6', 'class': 'searchfor'}),
-        f.text(_('Search for pages')),
+        f.text(_('Search for items')),
         f.table_cell(0),
         ''.join([''.join([
             f.table_row(1),
@@ -91,10 +91,10 @@
                 _('Search only in titles')),
                 ('', '<input type="checkbox" name="case" value="1">%s</input>' %
                 _('Case-sensitive search')),
-                ('', '<input type="checkbox" name="includeunderlay" value="1" checked>%s'
-                    '</input>' % _('Include underlay')),
-                ('', '<input type="checkbox" name="nosystempages" value="1">%s'
-                    '</input>' % _('No system pages')),
+                ('', '<input type="checkbox" name="excludeunderlay" value="1">%s'
+                    '</input>' % _('Exclude underlay')),
+                ('', '<input type="checkbox" name="nosystemitems" value="1">%s'
+                    '</input>' % _('No system items')),
                 ('', '<input type="checkbox" name="historysearch"value="1"%s>%s'
                     '</input>' %
                     (not macro.request.cfg.xapian_index_history and