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.6 -r1.7.2.7
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	22 Apr 2003 19:30:41 -0000	1.7.2.6
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	23 Apr 2003 06:04:13 -0000	1.7.2.7
@@ -20,7 +20,7 @@
     [list [list url1 text1] [list url2 text2] ... "terminal text"] 
     <pre>
     and generates the html fragment.  In general the higher level 
-    calls like ad_context_bar and ad_admin_context_bar should be
+    proc ad_context_bar should be
     used, and then only in the sitewide master rather than on 
     individual pages.
 
@@ -30,7 +30,6 @@
     @return html fragment
 
     @see ad_context_bar
-    @see ad_admin_context_bar
 } { 
     set out {}
     foreach element [lrange $context 0 [expr [llength $context] - 2]] { 
@@ -80,7 +79,6 @@
     @return an html fragment generated by ad_context_bar_html
     
     @see ad_context_bar_html
-    @see ad_admin_context_bar
 } {
     if {![parameter::get -package_id [site_node_closest_ancestor_package "acs-subsite"] -parameter ShowContextBarP -default 1]} {
 	return ""
@@ -109,67 +107,53 @@
 
 
 
-# a context bar, rooted at the workspace
-
 ad_proc -deprecated -public ad_context_bar_ws args {
-    Returns a Yahoo-style hierarchical navbar, starting with a link to workspace.
+    Returns a Yahoo-style hierarchical navbar. Use ad_context_bar instead.
 
     @param list of url desc ([list [list url desc] [list url desc] ... "terminal"])
     @return an html fragment generated by ad_context_bar_html
 
     @see ad_context_bar
 } {
-    return [ad_context_bar_html $args
+    return [ad_context_bar $args]
 }
 
 # a context bar, rooted at the workspace or index, depending on whether
 # user is logged in
 
 ad_proc -deprecated -public ad_context_bar_ws_or_index args {
-    Returns a Yahoo-style hierarchical navbar, starting with a link to
-    either the workspace or /, depending on whether or not the user is
-    logged in.  You should probably be using ad_context_bar and 
-    then only in the sitewide master.
+    Returns a Yahoo-style hierarchical navbar. Use ad_context_bar instead.
 
     @param args list of url desc ([list [list url desc] [list url desc] ... "terminal"])
-    @return an html fragment generated by ad_context_bar_html
+    @return an html fragment generated by ad_context_bar
 
     @see ad_context_bar
 } {
-    if { [ad_conn user_id] == 0 && ![string match /pvt/home* [ad_conn url]] } { 
-	set choices [list [list "/" [ad_system_name]]]
-    } else {
-	set choices [list]
-    }
-
-    return [ad_context_bar_html [concat $choices $args]]
+    return [ad_context_bar $args]
 }
 
-ad_proc -public ad_admin_context_bar args { 
-    Returns a Yahoo-style hierarchical navbar, starting with links
-    workspace and admin home.
-    Suitable for use in pages underneath /admin.
+ad_proc -public -deprecated ad_admin_context_bar args { 
+    Returns a Yahoo-style hierarchical navbar. Use ad_context_bar instead.
 
     @param args list of url desc ([list [list url desc] [list url desc] ... "terminal"])
-    @return an html fragment generated by ad_context_bar_html
+    @return an html fragment generated by ad_context_bar
 
     @see ad_context_bar
 } {
-    set context [ad_context_node_list [ad_conn node_id]]
-
-    return [ad_context_bar_html [concat $context $args]]
+    return [ad_context_bar $args]
 }
 
 ad_proc -public ad_navbar args {
     produces navigation bar. notice that navigation bar is different
-    than context bar, which exploits a tree structure. navbar will just
-    display a list of nicely formatted links.
+    than context bar, which displays packages in the site map. Navbar will
+    only generate HTML for those links passed to it.
 
     @param args list of url desc ([list [list url desc] [list url desc]])
 
     @return html fragment
 
     @see ad_choice_bar
+    @see ad_context_bar_html
 } {
     set counter 0
     foreach arg $args {