--- trunk/templates/results.html	2004/05/06 16:53:40	13
+++ trunk/templates/results.html	2004/05/08 20:34:26	27
@@ -1,14 +1,39 @@
-Found <b>[% results.size %]</b> results for query <tt>[% param.search %]</tt>.
+<span class="results">
+[% IF results.size < total_hits %]<abbr title="showing">[% results.size %]</abbr>/[% END %][% total_hits %]
+[% IF total_hits > 1 %]messages[% ELSE %]message[% END %]
+for
+ <span class="search_query">
+ [% param.search %]
+ </span>
+</span>
+
+[% IF date_limit %]
+<span class="date_limit">
+Date limit:
+<a href="/[% url_search %]">[% date_limit %]</a>
+</span>
+[% END %]
+
+<span class="sort">
+Sort by: [% sort_bar(param,"","&nbsp;|&nbsp;","") %]
+</span>
 
 [% FOR msg = results %]
- <hr>
-<span class="subject"><a href="?show_id=[% msg.id %]">[% msg.subject %]</a></span>
+<div class="headers">
+<span class="search">[% search('subject',msg.subject,param.sort_by,'[?]') %]</span>
+<span class="subject"><a href="[% url_show_id(msg.id) %]">[% msg.subject %]</a></span>
 <br>
 [% from(msg) %]
 [% date(msg) %]
 <br>[% to(msg) %]
-<br><tt>[% FILTER html %]
-[% FILTER body5 ; msg.body ; END %]
+</div>
+<div class="message">
+<pre>[% FILTER html %][% FILTER body5 ; msg.body ; END %][% END %]</pre>
+</div>
 [% END %]
-</tt>
+
+[% IF total_hits - results.size > 0 %]
+<span class="notice">
+There are [% total_hits - results.size %] more hits.
+</span>
 [% END %]