changeset 1220:c85f3cf602c9

small fixes for pagelinks
author Franz Pletz <fpletz AT franz-pletz DOT org>
date Sun, 06 Aug 2006 13:10:02 +0200
parents d56eeab4e070
children 2f98fbe3a527
files MoinMoin/search/results.py wiki/htdocs/modern/css/common.css
diffstat 2 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/search/results.py	Sun Aug 06 12:42:40 2006 +0200
+++ b/MoinMoin/search/results.py	Sun Aug 06 13:10:02 2006 +0200
@@ -647,7 +647,7 @@
     def _img_url(self, img):
         cfg = self.request.cfg
         # XXX: proper gfx
-        #return '%s/%s/img/%s' % (cfg.url_prefix, cfg.theme_default, img)
+        #return '%s/%s/img/%s' % (cfg.url_prefix, cfg.theme.name, img)
         return 'http://www.google.com/intl/en/%s' % img
 
     def formatPrevNextPageLinks(self, hitsFrom, hitsPerPage, hitsNum):
@@ -692,9 +692,9 @@
                     cur_page + (pages - 1 - cur_page) or
                     cur_page + 6)))
         l.extend([''.join([
-                f.url(1, href=page_url(i)),
+                i != cur_page and f.url(1, href=page_url(i)) or '',
                 f.text(str(i+1)),
-                f.url(0),
+                i != cur_page and f.url(0) or '',
             ]) for i in page_range])
 
         # next page available
@@ -720,10 +720,10 @@
                 ''.join([
                     ''.join([
                         f.table_cell(1),
-                        f.url(1, href=page_url(i)),
+                        i != cur_page and f.url(1, href=page_url(i)) or '',
                         f.image(self._img_url(i == cur_page and
                             'nav_current.gif' or 'nav_page.gif')),
-                        f.url(0),
+                        i != cur_page and f.url(0) or '',
                         f.table_cell(0),
                     ]) for i in page_range
                 ]),
--- a/wiki/htdocs/modern/css/common.css	Sun Aug 06 12:42:40 2006 +0200
+++ b/wiki/htdocs/modern/css/common.css	Sun Aug 06 13:10:02 2006 +0200
@@ -366,6 +366,14 @@
     margin: 0;
     text-align: center;
     vertical-align: middle;
+    color: #a90a08;
+    font-weight: bold;
+}
+
+.searchpages td a, .searchpages td a:link {
+    color: #000000;
+    text-decoration: underline;
+    font-weight: normal;
 }
 
 /* MonthCalendar css */