Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/search/www/search.adp	10 Mar 2005 01:42:14 -0000	1.7
+++ openacs-4/packages/search/www/search.adp	8 Nov 2005 18:24:07 -0000	1.8
@@ -1,102 +1,97 @@
 <master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context;noquote@</property>
-  <property name="in_search_p">t</property>
-  <property name="robots">noindex,nofollow</property>
-
-  <property name="header_stuff">
-    <style type="text/css">
-    .hint {
-      font-style: italic;
-    }
-    .url {
-      color: green;
-    }
-    .result {
-      margin: 1em 0 0 0;
-      padding: 0 0 0 1em;
-      border-left: 3px solid grey;
-    }
-    .result b {
-      background: yellow;
-      padding: 0 3px;
-    }
-    </style>
-  </property>
-
-  <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 style="margin: 0 0 1em 1em; padding: 0; float: right;"><a href="@url_advanced_search@">#search.Advanced_Search#</a></p>
+<include src="/packages/dotlrn/www/dotlrn-search">
+<if @t@ eq "Search">
+  <i>#search.lt_Tip_In_most_browsers_#</i><br><br>
+</if>
   <if @empty_p@ true>
     <p class="hint">#search.lt_You_must_specify_some#</p>
   </if><else>
-    <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 @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>
 
-    <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>
+<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 @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 @count@ eq 0>
+  Your search - <b>@query@</b> - did not match any content.
+  <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>
-    <else>
-      <p>#search.Searched_for_query#</p>
-      <p>#search.Results_count#</p>
-    </else>
+  </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>
 
-    <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 @to_result_page@>
+  <center>
 
-      <if @stw@ not nil>
-        <p>#search.lt_Try_your_query_on_stw#</p>
-      </if>
+    <small>#search.Result_page#</small>
+
+    <if @from_result_page@ lt @current_result_page@>
+      <small><a href=@url_previous@><font color=0000cc><b>#search.Previous#</b></font></a></small>
     </if>
-  </else>
+    &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>
+  <include src="/packages/dotlrn/www/dotlrn-search">
+  </center>
+
+  <if @stw@ not nil>
+    <center>
+      <font size=-1>#search.lt_Try_your_query_on_stw#</font></center>
+    </center>
+  </if>
+</if>
+</else>
\ No newline at end of file