Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/www/site-master.tcl	29 Jan 2004 15:07:48 -0000	1.15
+++ openacs-4/www/site-master.tcl	16 Feb 2004 14:47:41 -0000	1.16
@@ -12,6 +12,10 @@
     set header_stuff {}
 }
 
+if { [template::util::is_nil subnavbar_link] } {
+    set subnavbar_link ""
+}
+
 # This will set 'sections' and 'subsections' multirows
 subsite::define_pageflow -section $section
 subsite::get_section_info -array section_info
@@ -28,6 +32,9 @@
 # Get system name
 set system_name [ad_system_name]
 set system_url [ad_url]
+if { [string equal [ad_conn url] "/"] } {
+    set system_url ""
+}
 
 # Get user information
 set sw_admin_p 0
@@ -67,6 +74,14 @@
     set login_url [ad_get_login_url -return]
 }
 
+# Context bar
+if { [info exists context] } {
+    set context_tmp $context
+    unset context
+} else {
+    set context_tmp {}
+}
+ad_context_bar_multirow -- $context_tmp
 
 
 # change locale
@@ -76,16 +91,16 @@
         "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]"
 }
 
-
-
 # Curriculum bar
 set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $subsite_node_id]]
 
 
+# Who's Online
 set num_users_online [lc_numeric [whos_online::num_users]]
 
 set whos_online_url "[subsite::get_element -element url]shared/whos-online"
 
+
 #----------------------------------------------------------------------
 # Display user messages
 #----------------------------------------------------------------------