Index: openacs-4/packages/forums/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.adp,v
diff -u -N -r1.1 -r1.1.1.1
--- openacs-4/packages/forums/www/search.adp	2 Jul 2002 02:00:01 -0000	1.1
+++ openacs-4/packages/forums/www/search.adp	28 Jun 2006 20:30:29 -0000	1.1.1.1
@@ -1,58 +1,9 @@
-<master src="master">
-<property name="title">Search Forums</property>
-<property name="context_bar">@context_bar@</property>
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
 
 <center>
 
-  <table cellpadding="5" width="95%">
+  <include src="/packages/forums/lib/search/search-chunk">
 
-    <tr>
-      <td align="right">
-<formtemplate id="search">
-        Search:&nbsp;<formwidget id="search_text">
-</formtemplate>
-      </td>
-    </tr>
-
-  </table>
-
-  <br>
-
-  <table bgcolor="#cccccc" cellpadding="5" width="95%">
-
-    <tr>
-      <th align="left" width="60%">Subject</th>
-      <th align="left" width="20%">Author</th>
-      <th align="center" width="20%">Posting Date</th>
-    </tr>
-
-<if @messages:rowcount@ gt 0>
-<multiple name="messages">
-
-  <if @messages.rownum@ odd>
-    <tr bgcolor="#eeeeee">
-  </if>
-  <else>
-    <tr bgcolor="#d9e4f9">
-  </else>
-
-      <td>
-        <a href="message-view?message_id=@messages.message_id@">@messages.subject@</a>
-      </td>
-      <td><a href="user-history?user_id=@messages.user_id@">@messages.user_name@</a></td>
-      <td align="center">@messages.posting_date@</td>
-    </tr>
-
-</multiple>
-</if>
-<else>
-    <tr bgcolor="#eeeeee">
-      <td colspan="3">
-        <i>No Messages</i>
-      </td>
-    </tr>
-</else>
-
-  </table>
-
 </center>