Index: openacs-4/packages/acs-subsite/www/group-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/group-master.adp	24 Jan 2004 16:41:46 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/group-master.adp	8 Feb 2004 18:39:06 -0000	1.11
@@ -8,12 +8,6 @@
   <if @focus@ not nil>
     <property name="focus">@focus;noquote@</property>
   </if>
-  <if @context_bar@ not nil>
-    <property name="context_bar">@context_bar;noquote@</property>
-  </if>
-  <if @context@ not nil>
-    <property name="context">@context;noquote@</property>
-  </if>
   <property name="header_stuff">
     @header_stuff;noquote@
     <!--<link rel="stylesheet" type="text/css" href="@css_url@" media="all">-->
@@ -27,10 +21,29 @@
 
 <!-- Context bar -->
 
-    <div class="subsite-context-bar">
-      <div style="float: right">@subnavbar_link;noquote@</div>
-      @context_bar;noquote@&nbsp;
-    </div>
+  <div id="context-bar">
+    <if @context_bar@ not nil>
+      <div id="breadcrumbs">@context_bar;noquote@</div>
+    </if>
+    <else>
+      <if @context:rowcount@ not nil>
+        <div id="breadcrumbs">
+          <ul>
+            <multiple name="context">
+              <if @context.url@ not nil>
+                <li><a href="@context.url@">@context.label@</a> &#187;</li>
+              </if>
+              <else>
+                <li>@context.label@</li>
+              </else>
+            </multiple>
+          </ul>
+        </div>
+      </if>
+    </else>
+    <div id="subnavbar_links">@subnavbar_link;noquote@</div>
+    <div style="clear: both;"></div>
+  </div>
 
 <!-- Top level navigation -->
 
Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/group-master.tcl	5 Jan 2004 09:43:30 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/group-master.tcl	8 Feb 2004 18:39:06 -0000	1.10
@@ -31,21 +31,13 @@
 set css_url "/resources/acs-subsite/group-master.css"
 
 # Context bar
-if { [template::util::is_nil no_context_p] } {
-    if { ![template::util::is_nil context] } {
-        set cmd [list ad_context_bar --]
-        foreach elem $context {
-            lappend cmd $elem
-        }
-        set context_bar [eval $cmd]
-    }
-
-    if [template::util::is_nil context_bar] { 
-        set context_bar [ad_context_bar]
-    }
+if { [info exists context] } {
+    set context_tmp $context
+    unset context
 } else {
-    set context_bar {}
+    set context_tmp {}
 }
+ad_context_bar_multirow -- $context_tmp
 
 if { [string equal [ad_conn url] $subsite_url] } {
     set subsite_url {}