Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/search/www/search.adp	13 Jan 2005 13:58:41 -0000	1.4
+++ openacs-4/packages/search/www/search.adp	2 Feb 2005 21:18:03 -0000	1.5
@@ -1,115 +1,94 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
-<form method=GET action=search>
-  <small>
-    <a href=@url_advanced_search@>#search.Advanced_Search#</a>
-    <br>
-    <input type=text name=q size=31 maxlength=256 value="@query@">
-    <input type=submit value="#search.Search#" name=t>
-    <input type=submit value="#search.Feeling_Lucky#" name=t>
-  </small>
-</form>
-<if @t@ eq "Search">
-  <i>#search.lt_Tip_In_most_browsers_#</i><br><br>
-</if>
+  <property name="title">@page_title@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="header_stuff">
+<style type="text/css">
+.hint {
+      font-style: italic;
+}
+.url {
+      color: green;
+}
+.result {
+      border-bottom: 1px solid black;
+      padding: 1em;
+}
+</style>
+</property>
 
-	<if @and_queries_notice_p@ eq 1>
-      	  <font color=6f6f6f>
-          #search.The#
-          [<a href=help/basics#and>#search.details#</a>]<br>
-        </font>
-	</if>
-	<if @nstopwords@ eq 1>
-        <font color=6f6f6f>
-          #search.lt_bstopwordsb_is_a_very#
-          [<a href=help/basics#stopwords>#search.details#</a>]<br>
-        </font>
-	</if>
-	<if @nstopwords@ gt 1>
-      	  <font color=6f6f6f>
-          #search.lt_The_following_words_a# <b>@stopwords@</b>.
-          [<a href=help/basics#stopwords>#search.details#</a>]<br>
-      	  </font>
-	</if>
+  <form method="get" action="search">
+    <input type="text" name="q" size="60" maxlength="256" value="@query@" />
+    <input type="submit" value="#search.Search#" name="t" />
+    <!--<input type=submit value="#search.Feeling_Lucky#" name="t" />-->
+  </form>
+  <p><a href="@url_advanced_search@">#search.Advanced_Search#</a></p>
+  <if @t@ eq "Search">
+    <p class="hint">#search.Tip_In_most_browsers_return#</p>
+  </if>
 
-<multiple name="searchresult">
-	<if @searchresult.title_summary@ nil>
-  		<a href=@searchresult.url_one@>#search.Untitled#</a><br>
-	</if>	
-	<else>
-	  <a href=@searchresult.url_one@>@searchresult.title_summary;noquote@</a><br>
-	</else>
-	<if @searchresult.txt_summary@ nil>	
-	</if>
-	<else>	
-	@searchresult.txt_summary;noquote@<br>	
-	</else>
-	<font color=green>@searchresult.url_one@</font><br><br>
-</multiple>
+  <if @and_queries_notice_p@ eq 1>
+    <p class="hint">#search.and_not_needed# [<a href="help/basics#and">#search.details#</a>]</p>
+  </if>
+  <if @nstopwords@ eq 1>
+    <p class="hint">#search.lt_bstopwordsb_is_a_very# [<a href="help/basics#stopwords">#search.details#</a>]</p>
+  </if>
+  <if @nstopwords@ gt 1>
+    <p class="hint">#search.lt_The_following_words_a# [<a href="help/basics#stopwords">#search.details#</a>]</p>
+  </if>
 
-<if @count@ eq 0>
-  Your search - <b>@query@</b> - did not match any documents.
-  <br>#search.lt_No_pages_were_found_c#<b>@query@</b>".
-  <br><br>#search.Suggestions#
-  <ul>
-    <li>#search.lt_Make_sure_all_words_a#
-    <li>#search.lt_Try_different_keyword#
-    <li>#search.lt_Try_more_general_keyw#
-    <if @nquery@ gt 2>
-      <li>#search.Try_fewer_keywords#
-    </if>
-  </ul>
-</if>
-<else>
-  <table width=100% bgcolor=3366cc border=0 cellpadding=3 cellspacing=0>
-    <tr><td>
-      <font color=white>
-        #search.Searched_for_query#
-      </font>
-    </td><td align=right>
-      <font color=white>
-        #search.Results# <b>@low@-@high@</b> #search.of_about# <b>@count@</b>#search.________Search_took# <b>@elapsed@</b> #search.seconds# 
-      </font>     
-    </td></tr>
-  </table>
-  <br clear=all>
-</else>
+  <multiple name="searchresult">
+    <div class="result">
+      <if @searchresult.title_summary@ nil>
+        <a href="@searchresult.url_one@">#search.Untitled#</a>
+      </if>
+      <else>
+        <div class="title"><a href="@searchresult.url_one@">@searchresult.title_summary;noquote@</a></div>
+      </else>
+      <if @searchresult.txt_summary@ not nil>	
+        <div class="search-match">@searchresult.txt_summary;noquote@</div>
+      </if>
+      <div class="url">@searchresult.url_one@</div>
+    </div>
+  </multiple>
 
-<if @from_result_page@ lt @to_result_page@>
-  <center>
+  <if @count@ eq 0>
+    <p>#search.lt_No_pages_were_found_c#</p>
+    <p>#search.Suggestions#</p>
+    <ul>
+      <li>#search.lt_Make_sure_all_words_a#</li>
+      <li>#search.lt_Try_different_keyword#</li>
+      <li>#search.lt_Try_more_general_keyw#</li>
+      <if @nquery@ gt 2>
+        <li>#search.Try_fewer_keywords#</li>
+      </if>
+    </ul>
+  </if>
+  <else>
+    <p>#search.Searched_for_query#</p>
+    <p>#search.Results_count#</p>
+  </else>
 
-    <small>#search.Result_page#</small>
+  <if @from_result_page@ lt @to_result_page@>
+    <div class="search-pages">
+      #search.Result_page#
+      <if @from_result_page@ lt @current_result_page@>
+        <a href="@url_previous@">#search.Previous#</a>
+      </if>
+      &nbsp;@choice_bar;noquote@&nbsp;
+      <if @current_result_page@ lt @to_result_page@>
+	<a href="@url_next@">#search.Next#</a>
+      </if>
+    </div>
+  </if>
+  <if @count@ gt 0>
+    <div>
+      <form method="get" action="search">
+        <input type="text" name="q" size="60" maxlength="256" value="@query@" />
+        <input type="submit" value="#search.Search#" />
+      </form>
+    </div>
 
-    <if @from_result_page@ lt @current_result_page@>
-      <small><a href=@url_previous@><font color=0000cc><b>#search.Previous#</b></font></a></small>
+    <if @stw@ not nil>
+      <p>#search.lt_Try_your_query_on_stw#</p>
     </if>
-    &nbsp;@choice_bar;noquote@&nbsp;
-    
-    <if @current_result_page@ lt @to_result_page@>
-	<small><a href=@url_next@><font color=0000cc><b>#search.Next#</b></font></a></small>
-    </if>
-  </center>
-</if>
-<if @count@ gt 0>
-  <center>
-    <table border=0 cellpadding=3 cellspacing=0>
-      <tr><td nowrap>
-        <form method=GET action=search>
-          <center>
-            <small>
-              <input type=text name=q size=31 maxlength=256 value="@query@">
-              <input type=submit value=Search>
-            </small>
-          </center>
-        </form>
-      </td></tr>
-    </table>
-  </center>
-
-  <if @stw@ not nil>
-    <center>
-      <font size=-1>#search.lt_Try_your_query_on_stw#</font></center>
-    </center>
   </if>
-</if>