Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -N -r1.25.2.8 -r1.25.2.9
--- openacs-4/packages/search/search.info	22 Apr 2007 08:57:50 -0000	1.25.2.8
+++ openacs-4/packages/search/search.info	1 Jun 2007 10:56:50 -0000	1.25.2.9
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.3.1" url="http://openacs.org/repository/download/apm/search-5.3.1.apm">
+    <version name="5.3.2d1" url="http://openacs.org/repository/download/apm/search-5.3.2d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2007-04-22</release-date>
         <maturity>3</maturity>
@@ -18,7 +18,7 @@
         <description format="text/html">Site wide search implemented with service contracts, currently 
         only supports postgres via the OpenFTS driver.</description>
 
-        <provides url="search" version="5.3.1"/>
+        <provides url="search" version="5.3.2d1"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -N -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/search/www/search.adp	24 May 2007 16:19:37 -0000	1.10.2.3
+++ openacs-4/packages/search/www/search.adp	1 Jun 2007 10:56:51 -0000	1.10.2.4
@@ -68,21 +68,30 @@
   </else>
 
 
-<if @from_result_page@ lt @to_result_page@>
-  <div id="results-pages">
+        <if @results_paginator:rowcount@ gt 1>
+          <div id="results-pages" class="list-paginator-bottom">
 
-    #search.Result_page#
+          <ul class="compact list-paginator">
+            <li>#search.Result_page#</li>
+            <if @from_result_page@ lt @current_result_page@>
+              <li><a href="@url_previous@">#search.Previous#</a></li>
+            </if>
 
-    <if @from_result_page@ lt @current_result_page@>
-      <a href="@url_previous@"><b>#search.Previous#</b></a>
-    </if>
-    &nbsp;@choice_bar;noquote@&nbsp;
-    
-    <if @current_result_page@ lt @to_result_page@>
-	<a href="@url_next@"><b>#search.Next#</b></a>
-    </if>
-  </div>
-</if>
+            <multiple name="results_paginator">
+              <if @current_result_page@ eq @results_paginator.item@>
+                <li class="current">@results_paginator.item@</li>
+              </if>
+              <else>
+                <li><a href="@results_paginator.link@">@results_paginator.item@</a></li>
+              </else>
+            </multiple>
+            <if @current_result_page@ lt @to_result_page@>
+              <li><a href="@url_next@">#search.Next#</a></li>
+            </if>
+          </ul>
+        </div>
+      </if>
+
 <if @count@ gt 0>
   <center>
     <div>
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -N -r1.22.2.5 -r1.22.2.6
--- openacs-4/packages/search/www/search.tcl	24 May 2007 16:19:37 -0000	1.22.2.5
+++ openacs-4/packages/search/www/search.tcl	1 Jun 2007 10:56:51 -0000	1.22.2.6
@@ -197,18 +197,13 @@
 }
 set ol_start [expr $offset + 1]
 
-set items [list]
-set links [list]
-set values [list]
+template::multirow create results_paginator item link
 for { set __i $from_result_page } { $__i <= $to_result_page} { incr __i } {
-    set link ""
-    append link "search?q=${urlencoded_query}&search_package_id=$search_package_id"
+    set link "search?q=${urlencoded_query}&search_package_id=$search_package_id"
     if { $__i > 1 } { append link "&offset=[expr ($__i - 1) * $limit]" }
     if { $num > 0 } { append link "&num=$num" }
 
-    lappend items $__i
-    lappend links $link
-    lappend values $__i
+    template::multirow append results_paginator $__i $link
 }
 
 set search_the_web [ad_parameter -package_id $package_id SearchTheWeb]
@@ -219,8 +214,6 @@
     }
 }
 
-set choice_bar [search::choice_bar $items $links $values $current_result_page]
-
 # header stuffs
 if {![template::multirow exists link]} {
     template::multirow create link rel type href title lang media
Index: openacs-4/packages/search/www/resources/search.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/resources/search.css,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/search/www/resources/search.css	24 May 2007 16:19:37 -0000	1.1.2.1
+++ openacs-4/packages/search/www/resources/search.css	1 Jun 2007 10:56:51 -0000	1.1.2.2
@@ -9,7 +9,6 @@
 
 #search-info p
 { 
-  font:normal;
   font-size:100%;
   color: #000000;
 }
@@ -52,3 +51,4 @@
   text-align:center;
   margin-bottom:5px;
 }
+