Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/www/default-master.adp	26 Jan 2004 14:13:54 -0000	1.22
+++ openacs-4/www/default-master.adp	8 Feb 2004 18:38:40 -0000	1.23
@@ -6,19 +6,37 @@
 
 <div id="body">
   <div id="navbar-body">
-    <div class="subsite-context-bar">
-      <div style="float: left">@context_bar;noquote@</div>
-      <div style="float: right">@subnavbar_link;noquote@</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="navlinks">@subnavbar_link;noquote@</div>
       <div style="clear: both;"></div>
     </div>
 
-      <div id="subsite-name">
-        <if @title@ not nil>
-          <h1 class="subsite-page-title">@title;noquote@</h1>
-        </if>
-      </div>
-      <slave>
-      <div style="clear: both;"></div>
+    <div id="subsite-name">
+      <if @title@ not nil>
+        <h1 class="subsite-page-title">@title;noquote@</h1>
+      </if>
+    </div>
+    <slave>
+    <div style="clear: both;"></div>
 
   </div>
 </div>
Index: openacs-4/www/default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/www/default-master.tcl	18 Nov 2003 12:35:10 -0000	1.17
+++ openacs-4/www/default-master.tcl	8 Feb 2004 18:38:40 -0000	1.18
@@ -23,19 +23,15 @@
     set signatory [ad_system_owner]
 }
 
-if { ![template::util::is_nil context] } {
-    set cmd [list ad_context_bar --]
-    foreach elem $context {
-        lappend cmd $elem
-    }
-    set context_bar [eval $cmd]
+if { [info exists context] } {
+    set context_tmp $context
+    unset context
+} else {
+    set context_tmp {}
 }
+ad_context_bar_multirow -- $context_tmp
 
-if { [template::util::is_nil context_bar] } {
-    set context_bar [ad_context_bar]
-}
 
-
 # Attributes
 
 template::multirow create attribute key value