--- OSAS/OSA_system/zpt/searchResult.zpt	2004/07/05 21:08:55	1.2
+++ OSAS/OSA_system/zpt/searchResult.zpt	2004/07/09 16:55:19	1.3
@@ -5,13 +5,22 @@
 </head>
 <body>
 
-<h2 tal:content="python:'Search Results for (%s) \'%s\''%(here.REQUEST.SESSION['searchtype'],here.REQUEST.SESSION['searchstring'])"/>
-
-<p><a tal:condition="here/hasPrevResults" href="prevResults">&lt;</a>
-<span tal:replace="python:'%i to %i of %i Results'%(here.REQUEST.SESSION['res_indexes'][0:3])"/>
-<a tal:condition="here/hasNextResults" href="nextResults">&gt;</a>
-| <a href="index_html">New search</a>
+<h2>Search Results</h2>
+<!-- search query -->
+<p><b><span tal:replace="python:'Query: (%s) \'%s\''%(here.REQUEST.SESSION['searchtype'],here.REQUEST.SESSION['searchstring'])"/><span tal:condition="python:here.REQUEST.SESSION['res_type_filter']" tal:replace="python:' (of type %s)'%here.REQUEST.SESSION['res_type_filter']"/></b>
+| <a href="index_html">New search</a></p>
+<!-- result type -->
+<p>Types:
+<tal:block tal:repeat="restype python:here.REQUEST.SESSION['resulttypes']">
+<a tal:attributes="href python:'search?restypefilter='+restype" tal:content="restype"/>
+</tal:block>
+<a href="search?restypefilter=">all</a>
 </p>
+<!-- result navigation -->
+<p align="center"><a tal:condition="here/hasPrevResults" href="prevResults">&lt;</a>
+<span tal:replace="python:'%i to %i of %i results'%(here.REQUEST.SESSION['res_indexes'][0:3])"/>
+<a tal:condition="here/hasNextResults" href="nextResults">&gt;</a></p>
+<hr/>
 <!-- result block -->
 <tal:block tal:repeat="res python:here.REQUEST.SESSION['resultgroup']">
 <!-- <span tal:content="python:res.rank"/> -->
@@ -20,7 +29,11 @@
 <hr/>
 </tal:block>
 <!-- end of result block -->
-
+<!-- result navigation -->
+<p align="center"><a tal:condition="here/hasPrevResults" href="prevResults">&lt;</a>
+<span tal:replace="python:'%i to %i of %i results'%(here.REQUEST.SESSION['res_indexes'][0:3])"/>
+<a tal:condition="here/hasNextResults" href="nextResults">&gt;</a>
+</p>
 </body>
 </html>
 
