Index: openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml,v
diff -u -N -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml	23 Apr 2007 05:55:07 -0000	1.9.2.2
+++ openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml	24 May 2007 16:19:37 -0000	1.9.2.3
@@ -30,7 +30,7 @@
   <msg key="Results">Results</msg>
   <msg key="results">results</msg>
   <msg key="Search">Search</msg>
-  <msg key="Searched_for_query">Searched for: %query%</msg>
+  <msg key="Searched_for_query">Search results for &lt;strong&gt;%query%&lt;/strong&gt;</msg>
   <msg key="seconds">seconds.</msg>
   <msg key="selected">selected</msg>
   <msg key="Suggestions">Suggestions:</msg>
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -N -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/search/www/search.adp	24 May 2007 13:37:46 -0000	1.10.2.2
+++ openacs-4/packages/search/www/search.adp	24 May 2007 16:19:37 -0000	1.10.2.3
@@ -1,7 +1,9 @@
 <master>
-<if @t@ eq "Search">
-  <i>#search.lt_Tip_In_most_browsers_#</i><br><br>
-</if>
+<property name="header_stuff">
+  <link href="/resources/search/search.css" rel="stylesheet" type="text/css">
+</property>
+<if @link:rowcount@ not nil><property name="&link">link</property></if>
+
 <if @empty_p@ true>
     <p class="hint">#search.lt_You_must_specify_some#</p>
 </if>
@@ -25,22 +27,6 @@
       	  </font>
 	</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 @count@ eq 0>
   Your search - <b>@query@</b> - did not match any content.
   <br>#search.lt_No_pages_were_found_c#<b>@query@</b>".
@@ -55,30 +41,47 @@
   </ul>
   </if>
   <else>
-  <table width="100%" bgcolor="3366cc" border=0 cellpadding=3 cellspacing=0>
-    <tr><td>
-        #search.Searched_for_query#
-    </td><td align=right>
-        #search.Results# <b>@low@-@high@</b> #search.of_about# <b>@count@</b>#search.________Search_took# <b>@elapsed@</b> #search.seconds# 
-    </td></tr>
-  </table>
-  <br clear=all>
+        <div id="search-info">
+          <p class="subtitle">#search.Searched_for_query#</p>
+          <p class="times">
+        #search.Results# <strong>@low@-@high@</strong> #search.of_about# <strong>@count@</strong>#search.________Search_took# <strong>@elapsed@</strong> #search.seconds# 
+          </p>
+        </div>
+        <div id="search-results">
+          <ol start="@ol_start@">
+            <multiple name="searchresult">
+              <li>
+                <div>
+                  <a href="@searchresult.url_one@" class="result-title">
+                    <if @searchresult.title_summary@ nil>#search.Untitled#</if>	
+                    <else>@searchresult.title_summary;noquote@</else>
+                  </a>
+                </div>
+                <if @searchresult.txt_summary@ not nil>	
+                  <div>@searchresult.txt_summary;noquote@</div>
+                </if>
+                <div class="result-url">@searchresult.url_one@</div>
+              </li>
+            </multiple>
+          </ol>
+        </div>
   </else>
 
+
 <if @from_result_page@ lt @to_result_page@>
-  <center>
+  <div id="results-pages">
 
-    <small>#search.Result_page#</small>
+    #search.Result_page#
 
     <if @from_result_page@ lt @current_result_page@>
-      <small><a href=@url_previous@><font color="0000cc"><b>#search.Previous#</b></font></a></small>
+      <a href="@url_previous@"><b>#search.Previous#</b></a>
     </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>
+	<a href="@url_next@"><b>#search.Next#</b></a>
     </if>
-  </center>
+  </div>
 </if>
 <if @count@ gt 0>
   <center>
@@ -87,14 +90,15 @@
         <input type="text" name="q" size="60" maxlength="256" value="@query@" />
         <input type="submit" value="#search.Search#" />
       </form>
+      <if @t@ eq "Search">
+        <i>#search.lt_Tip_In_most_browsers_#</i>
+      </if>
     </div>
-  </center>
 
-  <if @stw@ not nil>
-    <center>
-      <font size=-1>#search.lt_Try_your_query_on_stw#</font>
-    </center>
-  </if>
+    <if @stw@ not nil>
+      <p><font size=-1>#search.lt_Try_your_query_on_stw#</font></p>
+    </if>
+  </center>
 </if>
 </else>
 
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -N -r1.22.2.4 -r1.22.2.5
--- openacs-4/packages/search/www/search.tcl	24 May 2007 13:37:46 -0000	1.22.2.4
+++ openacs-4/packages/search/www/search.tcl	24 May 2007 16:19:37 -0000	1.22.2.5
@@ -195,8 +195,8 @@
     append url_previous "&num=$num"
     append url_next "&num=$num"
 }
+set ol_start [expr $offset + 1]
 
-
 set items [list]
 set links [list]
 set values [list]
@@ -220,3 +220,15 @@
 }
 
 set choice_bar [search::choice_bar $items $links $values $current_result_page]
+
+# header stuffs
+if {![template::multirow exists link]} {
+    template::multirow create link rel type href title lang media
+}
+template::multirow append link \
+    stylesheet \
+    "text/css" \
+    "/resources/search/search.css" \
+    "" \
+    "" \
+    "all"
Index: openacs-4/packages/search/www/resources/search.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/resources/search.css,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/resources/search.css	24 May 2007 16:19:37 -0000	1.1.2.1
@@ -0,0 +1,54 @@
+#search-info 
+{
+  margin-bottom:0px;
+  border-top:1px solid #cfcfcf;
+  background:#dddddd;
+  padding:3px 0;
+  width:100%;
+}
+
+#search-info p
+{ 
+  font:normal;
+  font-size:100%;
+  color: #000000;
+}
+
+#search-info p.subtitle 
+{
+  margin-left:3px;
+  position:absolute;
+  left:10px;
+  padding-left:5px;
+  margin-top:-1px;
+}
+
+#search-info p.times 
+{
+  text-align:right;
+  margin:0;
+  padding-right:5px;
+  margin-left:13em;
+  white-space:nowrap;
+}
+
+#search-results li
+{ 
+  margin-bottom:15px;
+}
+
+#search-results a.result-title
+{ 
+  font-size:110%;
+}
+
+#search-results .result-url
+{ 
+  color: #008000;
+}
+
+#results-pages 
+{
+  text-align:center;
+  margin-bottom:5px;
+}