Index: openacs-4/packages/search/www/advanced-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/advanced-search.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/search/www/advanced-search.adp	8 Nov 2005 18:24:07 -0000	1.7
+++ openacs-4/packages/search/www/advanced-search.adp	27 Nov 2007 22:16:26 -0000	1.8
@@ -2,24 +2,28 @@
 <property name="title">#search.Advanced_Search#</property>
 <property name="context">"advanced search"</property>
 
+<div>
 <form method=GET action=search>
+<p>
 <input type=text name=q size=41 maxlength=256 value="@q@">
 <input type=submit value="Search" name=t>
-<br>
-#search.Date_Range#
-<select name=dfs>
+</p>
+<p>
+<label for="dfs">#search.Date_Range#</label>
+<select id="dfs" name=dfs>
   <option value=all> #search.anytime#
   <option value=m3> #search.past_3_months#
   <option value=m6> #search.past_6_months#
   <option value=y1> #search.past_year#
 </select>
-#search.nbspDisplay#
-<select name=num>
+<label for="num">#search.nbspDisplay#</label>
+<select id="num" name=num>
  <option value=10 <if @num@ eq 10>#search.selected#</if>>10 #search.results#
  <option value=20 <if @num@ eq 20>#search.selected#</if>>20 #search.results#
  <option value=30 <if @num@ eq 30>#search.selected#</if>>30 #search.results#
  <option value=50 <if @num@ eq 50>#search.selected#</if>>50 #search.results#
  <option value=100 <if @num@ eq 100>#search.selected#</if>>100 #search.results#
 </select>
+</p>
 </form>
-
+</div>
Index: openacs-4/packages/search/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/search/www/index.adp	19 Nov 2007 19:21:23 -0000	1.9
+++ openacs-4/packages/search/www/index.adp	27 Nov 2007 22:16:26 -0000	1.10
@@ -1,15 +1,14 @@
 <master>
 <property name="title">#search.Search#</property>
 
-<center>
+<div style="text-align:center">
 <form method=GET action=search>
-  <small>
-  <a href=advanced-search>#search.Advanced_Search#</a>
-  <br>
+  <div><small><a href=advanced-search>#search.Advanced_Search#</a></small></div>
+  <div>
   <input type=text name=q size=80 maxlength=256>
   <br>
   <input type=submit value="#search.Search#" name=t>
   <input type=submit value="#search.Feeling_Lucky#" name=t>
-  </small>
+  </div>
 </form>
-</center>
+</div>
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/search/www/search.adp	19 Nov 2007 19:21:23 -0000	1.12
+++ openacs-4/packages/search/www/search.adp	27 Nov 2007 22:16:26 -0000	1.13
@@ -1,9 +1,5 @@
 <master>
-<property name="header_stuff">
-  <link href="/resources/search/search.css" rel="stylesheet" type="text/css">
-</property>
 <property name="context">Results</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>
@@ -49,17 +45,15 @@
           </p>
         </div>
         <div id="search-results">
-          <ol start="@ol_start@">
+          <ol style="counter-reset:item @offset@">
             <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>
+                  <div class="result-text">@searchresult.txt_summary;noquote@</div>
                 </if>
                 <div class="result-url">@searchresult.url_one@</div>
               </li>
@@ -94,21 +88,21 @@
       </if>
 
 <if @count@ gt 0>
-  <center>
-    <div>
+    <div style="text-align:center">
       <form method="get" action="search">
-        <input type="text" name="q" size="60" maxlength="256" value="@query@" />
-        <input type="submit" value="#search.Search#" />
+        <div>
+        <input type="text" name="q" size="60" maxlength="256" value="@query@">
+        <input type="submit" value="#search.Search#">
+        </div>
       </form>
       <if @t@ eq "Search">
         <i>#search.lt_Tip_In_most_browsers_#</i>
       </if>
     </div>
 
     <if @stw@ not nil>
-      <p><font size=-1>#search.lt_Try_your_query_on_stw#</font></p>
+      <p style="text-align:center;font-size=-1">#search.lt_Try_your_query_on_stw#</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 -r1.29 -r1.30
--- openacs-4/packages/search/www/search.tcl	21 Oct 2007 12:28:43 -0000	1.29
+++ openacs-4/packages/search/www/search.tcl	27 Nov 2007 22:16:26 -0000	1.30
@@ -201,7 +201,6 @@
     append url_previous "&num=$num"
     append url_next "&num=$num"
 }
-set ol_start [expr {$offset + 1}]
 
 template::multirow create results_paginator item link
 for { set __i $from_result_page } { $__i <= $to_result_page} { incr __i } {
@@ -221,13 +220,6 @@
 }
 
 # 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"
+template::head::add_css \
+    -href "/resources/search/search.css" \
+    -media "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 -r1.2 -r1.3
--- openacs-4/packages/search/www/resources/search.css	27 Oct 2007 22:57:26 -0000	1.2
+++ openacs-4/packages/search/www/resources/search.css	27 Nov 2007 22:16:26 -0000	1.3
@@ -34,15 +34,28 @@
 #search-results li
 { 
   margin-bottom:15px;
+  display:block;
 }
 
+#search-results li:before
+{ 
+  content: counter(item) ". "; 
+  counter-increment: item;
+}
+
 #search-results a.result-title
 { 
   font-size:110%;
 }
 
+#search-results .result-text
+{ 
+  padding-left: 14px;
+}
+
 #search-results .result-url
 { 
+  padding-left: 14px;
   color: #008000;
 }