Index: openacs-4/packages/ecommerce/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/index.adp	8 Aug 2008 09:40:13 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/index.adp	10 Aug 2008 11:31:44 -0000	1.4
@@ -1,15 +1,8 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">Administration</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
-<property name="show_toolbar_p">t</property>
-
-<h2>@page_title@</h2>
-
-<hr>
-Documentation: <a href="/doc/ecommerce">/doc/ecommerce</a> or <a href="@ec_url@doc/">@ec_url@doc/</a>
-<hr>
-
 <h3>business operations</h3>
 <ul>
 <li><a href="orders/">Orders / Shipments / Refunds</a> <font size=-1>(@n_in_last_24_hours@ orders in last 24 hours; @n_in_last_7_days@ in last 7 days)</font></li>
@@ -28,7 +21,7 @@
 </ul>
 
 <h3>website administration</h3><ul>
-
+<li><a href="../doc/">Documentation</a></li>
 <li><a href="problems/">Potential Problems</a> <font size=-1>(@unresolved_problem_count@ unresolved problem@unresolved_problem_count_plural@)</font></li>
 
 <if @paymentgateway_show@>
@@ -45,10 +38,10 @@
 
 <if @multiple_retailers_p@>
 <li><a href="retailers/">Retailers</a></li>
-<else>
+</if><else>
 <li><a href="shipping-costs/">Shipping Costs</a></li>
 <li><a href="sales-tax/">Sales Tax</a></li>
-</if>
+</else>
 
 <li><a href="mailing-lists/">Mailing Lists</a></li>
 <li><a href="email-templates/">Email Templates</a></li>
Index: openacs-4/packages/ecommerce/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/ecommerce/www/admin/index.tcl	9 Aug 2008 10:31:34 -0000	1.10
+++ openacs-4/packages/ecommerce/www/admin/index.tcl	10 Aug 2008 11:31:44 -0000	1.11
@@ -10,9 +10,6 @@
     {flush_db_cache 0}
 }
 
-set page_title "[ec_system_name] Administration"
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar "Administration"]
-
 ad_require_permission [ad_conn package_id] admin
 
 set ec_url [ec_url]
@@ -63,7 +60,7 @@
 # customer class membership requests
 set n_not_yet_approved_plural [ec_decode $n_not_yet_approved 1 "" "s"]
 
-set multiple_retailers_p [ad_parameter -package_id [ec_id] MultipleRetailersPerProductP ecommerce]
+set multiple_retailers_p [parameter::get -parameter MultipleRetailersPerProductP -default f]
 
 set ec_system_name [ec_system_name]