changeset 1361:a90ca97f1a9b

removed mooooin gfx
author Franz Pletz <fpletz AT franz-pletz DOT org>
date Tue, 15 Aug 2006 21:58:27 +0200
parents e26799c574b0
children 1194f8f91158
files MoinMoin/search/results.py wiki/htdocs/modern/css/common.css wiki/htdocs/modern/img/nav_current.png wiki/htdocs/modern/img/nav_first.png wiki/htdocs/modern/img/nav_last.png wiki/htdocs/modern/img/nav_next.png wiki/htdocs/modern/img/nav_page.png wiki/htdocs/modern/img/nav_prev.png
diffstat 8 files changed, 4 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/search/results.py	Tue Aug 15 00:06:07 2006 +0200
+++ b/MoinMoin/search/results.py	Tue Aug 15 21:58:27 2006 +0200
@@ -287,7 +287,7 @@
         output = [
             formatter.paragraph(1, attr={'class': 'searchstats'}),
             _("Results %(bs)s%(hitsFrom)d - %(hitsTo)d%(be)s "
-                    "of %(aboutHits)s %(bs)s%(hits)d%(be)s results out of"
+                    "of %(aboutHits)s %(bs)s%(hits)d%(be)s results out of "
                     "about %(pages)d pages.") %
                 {'aboutHits': self.estimated_hits[0],
                     'hits': self.estimated_hits[1], 'pages': self.pages,
@@ -652,10 +652,6 @@
             return ''.join(output)
         return ''
 
-    def _img_url(self, img):
-        cfg = self.request.cfg
-        return '%s/%s/img/%s.png' % (cfg.url_prefix, self.request.theme.name, img)
-
     def formatPrevNextPageLinks(self, hitsFrom, hitsPerPage, hitsNum):
         """ Format previous and next page links in page
 
@@ -714,39 +710,6 @@
         return ''.join([
             f.table(1, attrs={'tableclass': 'searchpages'}),
             f.table_row(1),
-                f.table_cell(1, attrs={'class': 'prev'}),
-                # first image, previous page
-                l[0] and
-                    ''.join([
-                        f.url(1, href=page_url(cur_page-1)),
-                        f.image(self._img_url('nav_prev')),
-                        f.url(0),
-                    ]) or
-                    f.image(self._img_url('nav_first')),
-                f.table_cell(0),
-                # images for ooos, highlighted current page
-                ''.join([
-                    ''.join([
-                        f.table_cell(1),
-                        i != cur_page and f.url(1, href=page_url(i)) or '',
-                        f.image(self._img_url(i == cur_page and
-                            'nav_current' or 'nav_page')),
-                        i != cur_page and f.url(0) or '',
-                        f.table_cell(0),
-                    ]) for i in page_range
-                ]),
-                f.table_cell(1, attrs={'class': 'next'}),
-                # last image, next page
-                l[-1] and
-                    ''.join([
-                        f.url(1, href=page_url(cur_page+1)),
-                        f.image(self._img_url('nav_next')),
-                        f.url(0),
-                    ]) or
-                    f.image(self._img_url('nav_last')),
-                f.table_cell(0),
-            f.table_row(0),
-            f.table_row(1),
                 f.table_cell(1),
                 # textlinks
                 (f.table_cell(0) + f.table_cell(1)).join(l),
@@ -772,7 +735,6 @@
             f.paragraph(0),
         ])
 
-
     def querystring(self, querydict=None):
         """ Return query string, used in the page link """
         if querydict is None:
--- a/wiki/htdocs/modern/css/common.css	Tue Aug 15 00:06:07 2006 +0200
+++ b/wiki/htdocs/modern/css/common.css	Tue Aug 15 21:58:27 2006 +0200
@@ -363,26 +363,17 @@
 
 .searchpages tr, .searchpages td {
     border: 0;
-    padding: 0;
+    padding: 5px;
     margin: 0;
     text-align: center;
     vertical-align: middle;
-    color: #a90a08;
+    color: #b93a58;
     font-weight: bold;
-}
-
-.searchpages td.prev {
-    text-align: right;
-}
-
-.searchpage td.next {
-    text-align: left;
+    font-size: 1.05em;
 }
 
 .searchpages td a, .searchpages td a:link {
-    color: #000000;
     text-decoration: underline;
-    font-weight: normal;
 }
 
 /* MonthCalendar css */
Binary file wiki/htdocs/modern/img/nav_current.png has changed
Binary file wiki/htdocs/modern/img/nav_first.png has changed
Binary file wiki/htdocs/modern/img/nav_last.png has changed
Binary file wiki/htdocs/modern/img/nav_next.png has changed
Binary file wiki/htdocs/modern/img/nav_page.png has changed
Binary file wiki/htdocs/modern/img/nav_prev.png has changed