Index: openacs-4/packages/ecommerce/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/default-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/default-master.adp	24 Feb 2005 13:33:14 -0000	1.2
+++ openacs-4/packages/ecommerce/www/default-master.adp	11 Aug 2008 13:01:09 -0000	1.3
@@ -7,13 +7,10 @@
   <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
 
 <if @is_not_in_ecommerce_p@ true>
-   <include src="/packages/ecommerce/www/toolbar" />
+   <include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 </if>
-<else>
-   <if @show_toolbar_p@ not nil>
-   <include src="/packages/ecommerce/www/toolbar" combocategory_id=@combocategory_id@ category_id=@category_id@ subcategory_id=@subcategory_id@ search_text=@search_text@ />
-    </if>
-</else>
     
 <div id="page-body">
   <if @title@ not nil>