--- Webpacus/root/results.tt	2005/12/05 23:23:48	230
+++ Webpacus/root/results.tt	2006/02/20 15:33:19	408
@@ -1,5 +1,7 @@
 <!-- results -->
 
+[% USE dumper ; dumper.dump( hints ) %]
+
 [% hits = html_results.size || 0 %]
 
 [% IF hits < 1 %]
@@ -14,17 +16,12 @@
 
 <div>
 
-
 <span class="results">
 
-Found 
-[%- IF hits == hits_on_page ; -%]
-more than
-[%- END %]
-[% ( (page - 1) * hits_on_page ) + hits %]
-result
-[%- IF hits > 1 ; 's' ; END %]
-for '[% phrase %]'.
+Found [% hints.hit %] result[%- IF hints.hit > 1 ; 's' ; END %]
+for '[% phrase %]'
+[%- IF page > 1 ; ', this is page ' ; page ; END %]
+in [% hints.time %]s.
 
 [% IF attr && attr.size %]
 <span class="attr">[ [% attr.join(", ") %] ]</span>
@@ -33,21 +30,22 @@
 </span>
 
 
-
 <span class="switch_template">
-  <img src="img/star-red.gif"/>
+   
   <a href="#" onclick="return load_template('html_ffzg_results_short.tt');">short</a>
-  <img src="img/star-red.gif"/>
+  &middot; 
   <a href="#" onclick="return load_template('html_ffzg_results_nonstd.tt');">full</a>
-  <img src="img/star-red.gif"/>
+  &middot; 
   <a href="#" onclick="return load_template('html_ffzg_results_apa.tt');">APA</a>
-  <img src="img/star-red.gif"/>
+  &middot; 
   <a href="#" onclick="return load_template('html_ffzg_results_isbd.tt');">ISBD</a>
 </span>
 
 <br/>
 
-<div class="html_results">
+<a name="page_[% page %]"></a>
+
+<div class="html_results" id="html_results">
 
 [% FOREACH r IN html_results %]
 [% r %]
@@ -57,31 +55,34 @@
 
 </div>
 
-[% END # if hits > 1 %]
+<div class="pager" id="results_[% page + 1 %]">
+<a name="page_[% page + 1 %]"></a>
 
-<div class="pager">
 	Page:
 [% IF page > 1 %]
-	<a id="prev_page" href="#" onclick="return prev_page();">&lt;&lt;</a>
+	<a id="prev_page" href="#page_[% page - 1 %]" onclick="return true; 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>
+[% SET maxp = page - 1 %]
+[% FOREACH p IN [ 1 .. maxp ] %]
+	<a href="#page_[% p %]" onclick="return true; load_results_page([% p %]);">[% p %]</a>
 [% END %]
 	<b>[% page %]</b>
 [% IF hits > 1  && hits == hits_on_page %]
 	...
-	<a id="next_page" href="#" onclick="return next_page();">&gt;&gt;</a>
+	<a id="next_page" href="#page_[% page + 1 %]" onclick="next_page(); return true;">&gt;&gt;</a>
 [% END %]
+	<span id="searching_[% page + 1 %]" style="display: none;">
+		<img src="/img/indicator.gif" />
+	</span>
 </div>
 
-<div class="notice">
-End of results.
-</div>
+[% END # if hits > 1 %]
 
-<script type="text/javascript">
-hide_searching();
-</script>
+<input type="hidden" name="results_page_[% page %]" id="results_page_[% page %]" value="[%-
+ FOREACH n IN hints.node ;
+ n.key _ "/" _ n.value ;
+ IF ! loop.last ; " " ; END ;
+ END
+-%]"/>
 
 <!-- /results -->
-