--- trunk/templates/results.html	2004/05/08 14:27:54	24
+++ trunk/templates/results.html	2004/05/08 22:18:38	28
@@ -1,22 +1,41 @@
-Found [% total_hits %] messages, showing first <b>[% results.size %]</b>,
-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 %]
+[% IF param.search %]
+for
+ <span class="search_query">
+ [% param.search %]
+ </span>
+[% END %]
+</span>
+
 [% IF date_limit %]
-, date limit <tt>[% date_limit %]</tt>
-<a href="/[% url_search %]">off</a>
+<span class="date_limit">
+Date limit:
+<a href="/[% url_search %]">[% date_limit %]</a>
+</span>
 [% END %]
-, sort by [% sort_bar(param,"[&nbsp;","&nbsp;|&nbsp;","&nbsp;]") %]
+
+<span class="sort">
+Sort by: [% sort_bar(param,"","&nbsp;|&nbsp;","") %]
+</span>
 
 [% FOR msg = results %]
- <hr>
+<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) %]
+</div>
+<div class="message">
 <pre>[% FILTER html %][% FILTER body5 ; msg.body ; END %][% END %]</pre>
+</div>
 [% END %]
 
 [% IF total_hits - results.size > 0 %]
-<hr>
+<span class="notice">
 There are [% total_hits - results.size %] more hits.
+</span>
 [% END %]