--- Webpacus/root/results.tt	2005/11/26 16:22:02	159
+++ Webpacus/root/results.tt	2005/11/26 16:22:08	160
@@ -10,8 +10,7 @@
  [% IF attr && attr.size %]
  <span class="attr">[ [% attr.join(", ") %] ]</span>
  [% END %]
- [% STOP %]
-[% END %]
+[% ELSE %]
 
 <div>
 
@@ -19,10 +18,10 @@
 <span class="results">
 
 Found 
-[%- IF hits == 100 ; -%]
+[%- IF hits == hits_on_page ; -%]
 more than
 [%- END %]
-[% hits %]
+[% ( (page - 1) * hits_on_page ) + hits %]
 result
 [%- IF hits > 1 ; 's' ; END %]
 for '[% phrase %]'.
@@ -36,11 +35,11 @@
 
 
 <span class="switch_template">
-  <a href="#" onclick="load_template('html_ffzg_results_nonstd.tt'); return false;">full</a>
+  <a href="#" onclick="return load_template('html_ffzg_results_nonstd.tt');">full</a>
   <img src="img/star-red.gif"/>
-  <a href="#" onclick="load_template('html_ffzg_results_apa.tt'); return false;">APA</a>
+  <a href="#" onclick="return load_template('html_ffzg_results_apa.tt');">APA</a>
   <img src="img/star-red.gif"/>
-  <a href="#" onclick="load_template('html_ffzg_results_isbd.tt'); return false;">ISBD</a>
+  <a href="#" onclick="return load_template('html_ffzg_results_isbd.tt');">ISBD</a>
 </span>
 
 <br/>
@@ -55,10 +54,22 @@
 
 </div>
 
+[% END # if hits > 1 %]
+
 <div class="pager">
-	<a href="#" onclick="next_page(); return false;">more results</a>
+	Page:
+[% IF page > 1 %]
+	<a id="prev_page" href="#" onclick="return prev_page();">&lt;&lt;</a>
+[% END %]
+[% SET p = page - 1 %]
+[% FOREACH p IN [ 1 .. p ] %]
+	<a href="#" onclick="return load_results_page([% p %]);">[% p %]</a>
+[% END %]
+	<b>[% page %]</b>
+[% IF hits > 1  && hits == hits_on_page %]
 	...
-	<a href="#" onclick="prev_page(); return false;">back to last page</a>
+	<a id="next_page" href="#" onclick="return next_page();">&gt;&gt;</a>
+[% END %]
 </div>
 
 <div class="notice">