Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/www/default-master.adp	15 Sep 2003 05:59:37 -0000	1.16
+++ openacs-4/www/default-master.adp	30 Sep 2003 12:10:12 -0000	1.17
@@ -1,24 +1,21 @@
-<master src="site-master">
+<master src="blank-master">
   <property name="title">@title;noquote@</property>
   <if @header_stuff@ not nil><property name="header_stuff">@header_stuff;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="subsite-name">
-    <if @title@ not nil>
-      <h1 class="subsite-page-title">@title@</h1>
-    </if>
-  </div>
-  <div id="navbar-body">
-    <div class="subsite-context-bar">
-      @context_bar;noquote@&nbsp;
-    </div>
-    <div id="subnavbar-body">
-      <slave>
-      <div style="clear: both;"></div>
-    </div>
-  </div>
-</div>
+<include src="login-status" />
 
+<if @body_start_include@ not nil>
+<include src="@body_start_include@" />
+</if>
 
+<h1>@title;noquote@</h1>
+@context_bar;noquote@
+<hr />
+<slave>
+<if @curriculum_bar_p@ true>
+<include src="/packages/curriculum/lib/bar" />
+</if>
+<hr />
+<address><a href="mailto:@signatory@">@signatory@</a></address>