Index: openacs-4/packages/ecommerce/lib/contextbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/contextbar.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/ecommerce/lib/contextbar.adp	8 Aug 2008 12:23:47 -0000	1.1
+++ openacs-4/packages/ecommerce/lib/contextbar.adp	10 Aug 2008 10:53:36 -0000	1.2
@@ -1 +1 @@
-<p><if @ec_admin_p@>[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name;noquote@">Administer</a>&nbsp;] </if>[&nbsp;<a href="@cart_link@" title="Your Shopping Cart">View Your Shopping Cart</a>&nbsp;] </p>
+<if @ec_admin_p@>[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name;noquote@">Administer</a>&nbsp;] </if>
Index: openacs-4/packages/ecommerce/lib/contextbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/contextbar.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/ecommerce/lib/contextbar.tcl	8 Aug 2008 12:23:47 -0000	1.1
+++ openacs-4/packages/ecommerce/lib/contextbar.tcl	10 Aug 2008 10:53:36 -0000	1.2
@@ -1,16 +1,11 @@
 #     Add a [ Administer ] link to the template
-
-
-
 # Check for admin rights to this (the ecommerce) package.
 
 set ec_admin_p [permission::permission_p -no_login -object_id [ad_conn package_id] -privilege admin]
 if {$ec_admin_p} {
     set ec_admin_link "[ec_url]admin/"
 }
 
-set cart_link "[ec_url]shopping-cart"
-
 # Get the name of the ecommerce package
 
 set ec_system_name [ec_system_name]
Index: openacs-4/packages/ecommerce/lib/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/toolbar.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/ecommerce/lib/toolbar.adp	8 Aug 2008 13:09:48 -0000	1.1
+++ openacs-4/packages/ecommerce/lib/toolbar.adp	10 Aug 2008 10:53:36 -0000	1.2
@@ -7,3 +7,4 @@
  <if @current_location@ ne "your-account"> 
     [&nbsp;<a href="@ec_account_link@" title="View your @ec_system_name@ account">your @ec_system_name@ account</a>&nbsp;]
  </if>
+<include src="contextbar">
Index: openacs-4/packages/ecommerce/lib/toolbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/toolbar.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/ecommerce/lib/toolbar.tcl	8 Aug 2008 13:09:48 -0000	1.1
+++ openacs-4/packages/ecommerce/lib/toolbar.tcl	10 Aug 2008 10:53:36 -0000	1.2
@@ -6,6 +6,10 @@
 # Get the ecommerce package url
 set ecommerce_base_url [ec_url]
 
+if {![info exists current_location]} {
+    set current_location [file tail [ad_conn file]]
+}
+
 set ec_cart_link [ec_insecurelink [file join $ecommerce_base_url "shopping-cart"]]
 set ec_account_link [ec_insecurelink [file join $ecommerce_base_url "account"]]
 set ec_gift_cert_order_link [ec_insecurelink [file join $ecommerce_base_url "gift-certificate-order"]]