Index: openacs-4/packages/ecommerce/www/product-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-search.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/product-search.adp	13 Jan 2005 13:58:00 -0000	1.6
+++ openacs-4/packages/ecommerce/www/product-search.adp	10 Aug 2008 12:47:31 -0000	1.7
@@ -1,13 +1,16 @@
 <master>
-  <property name="title">@category_name@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
-  <property name="signatory">@ec_system_owner;noquote@</property>
+  <property name="title">Product search @category_name@</property>
+  <property name="current_location">Product Search</property>
+  <property name="search_text">@search_text@</property>
+  <property name="category_id">@category_id@</property>
+  <property name="subcategory_id">@subcategory_id@</property>
+  <property name="combocategory_id">@combocategory_id@</property>
 
-  <property name="show_toolbar_p">t</property>
-
-  <blockquote>
+  <include src="/packages/ecommerce/lib/toolbar"/>
+  <include src="/packages/ecommerce/lib/searchbar" combocategory_id=@combocategory_id@ category_id=@category_id@ subcategory_id=@subcategory_id@ search_text=@search_text@ />
+  
     @search_results;noquote@
-  </blockquote>
+