Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/www/default-master.adp	8 Feb 2004 18:38:40 -0000	1.23
+++ openacs-4/www/default-master.adp	16 Feb 2004 14:47:41 -0000	1.24
@@ -1,44 +1,17 @@
 <master src="site-master">
   <property name="title">@title;noquote@</property>
   <if @header_stuff@ not nil><property name="header_stuff">@header_stuff;noquote@</property></if>
+  <if @context@ not nil><property name="context">@context;noquote@</property></if>
+  <if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if>
   <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
   <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
 
-<div id="body">
-  <div id="navbar-body">
-    <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="page-body">
+  <if @title@ not nil>
+    <h1 class="page-title">@title;noquote@</h1>
+  </if>
 
-    <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>
+  <slave>
+  <div style="clear: both;"></div>
 </div>
 
-