Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -r1.7.2.5 -r1.7.2.6
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	7 Mar 2003 13:58:41 -0000	1.7.2.5
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	22 Apr 2003 19:30:41 -0000	1.7.2.6
@@ -72,7 +72,7 @@
     -node_id
     args
 } {
-    Returns a Yahoo-style hierarchical navbar. Includes "Your Workspace" or "Administration"
+    Returns a Yahoo-style hierarchical navbar. Includes "Administration"
     if applicable, and the subsite if not global.
 
     @param node_id If provided work up from this node, otherwise the current node
@@ -119,7 +119,7 @@
 
     @see ad_context_bar
 } {
-    return [ad_context_bar_html [concat [list [list "[ad_pvt_home]" "[ad_pvt_home_name]"]] $args]]
+    return [ad_context_bar_html $args
 }
 
 # a context bar, rooted at the workspace or index, depending on whether
@@ -139,7 +139,7 @@
     if { [ad_conn user_id] == 0 && ![string match /pvt/home* [ad_conn url]] } { 
 	set choices [list [list "/" [ad_system_name]]]
     } else {
-	set choices [list [list [ad_pvt_home] [ad_pvt_home_name]]]
+	set choices [list]
     }
 
     return [ad_context_bar_html [concat $choices $args]]
@@ -155,15 +155,9 @@
 
     @see ad_context_bar
 } {
-    if {[llength $args]} { 
-        set choices [list [list [ad_pvt_home] [ad_pvt_home_name]] \
-                         [list /acs-admin/ "ACS System Wide Administration"]]
-    } else { 
-        set choices [list [list [ad_pvt_home] [ad_pvt_home_name]] \
-                         "ACS System Wide Administration"]
-    }
+    set context [ad_context_node_list [ad_conn node_id]]
 
-    return [ad_context_bar_html [concat $choices $args]]
+    return [ad_context_bar_html [concat $context $args]]
 }
 
 ad_proc -public ad_navbar args {