--- Webpacus/root/results.tt	2006/04/30 23:20:03	439
+++ Webpacus/root/results.tt	2006/04/30 23:20:12	440
@@ -20,18 +20,19 @@
 
 <div>
 
-<span class="results">
+<div class="results">
 
-Found [% hints.hit %] result[%- IF hints.hit > 1 ; 's' ; END %]
-for '[% phrase %]'
+Found <em>[% hints.hit %] result[%- IF hints.hit > 1 ; 's' ; END %]</em>
+for '<em>[% phrase %]</em>'
 [%- IF page > 1 ; ', this is page ' ; page ; END %]
 in [% hints.time %]s.
+Showing results [% pager.first %] - [% pager.last %].
 
 [% IF attr && attr.size %]
 <span class="attr">[ [% attr.join(", ") %] ]</span>
 [% END %]
 
-</span>
+</div>
 
 
 <span class="switch_template">
@@ -62,23 +63,31 @@
 <div class="pager" id="results_[% page + 1 %]">
 <a name="page_[% page + 1 %]"></a>
 
-	Page:
-[% IF page > 1 %]
-	<a id="prev_page" href="#page_[% page - 1 %]" onclick="return true; return prev_page();">&lt;&lt;</a>
+[% IF pager.previous_page %]
+	<a id="prev_page"
+		href="#"
+		onclick="return load_results_page([% pager.previous_page %]);"
+	>&lt;&lt;</a>
 [% END %]
-[% SET maxp = page - 1 %]
-[% FOREACH p IN [ 1 .. maxp ] %]
-	<a href="#page_[% p %]" onclick="return true; load_results_page([% p %]);">[% p %]</a>
+
+Page:
+[% FOREACH page IN pager.pages_in_spread %]
+	[% IF ! page %]
+...
+	[% ELSIF page == pager.current_page %]
+<b>[% page %]</b>
+	[% ELSE %]
+<a href="#page_[% page %]" onclick="return load_results_page([% page %]);">[% page %]</a>
+	[% END %]
 [% END %]
-	<b>[% page %]</b>
-[% IF hits > 1  && hits == hits_on_page %]
-	...
-	<a id="next_page" href="#page_[% page + 1 %]" onclick="next_page(); return true;">&gt;&gt;</a>
+
+[% IF pager.next_page %]
+	<a id="prev_page"
+		href="#"
+		onclick="return load_results_page([% pager.next_page %]);"
+	>&gt;&gt;</a>
 [% END %]
-	<span id="searching_[% page + 1 %]" style="display: none;">
-		<img src="/img/indicator.gif" />
-	</span>
-</div>
+
 
 [% END # if hits > 1 %]