Index: openacs-4/packages/theme-selva/www/selva-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-master.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/theme-selva/www/selva-master.adp	1 Aug 2005 05:04:45 -0000	1.5
+++ openacs-4/packages/theme-selva/www/selva-master.adp	18 Sep 2005 12:27:08 -0000	1.6
@@ -1,32 +1,36 @@
-<master src="/packages/theme-selva/www/selva-site-master" />
+<master src="/packages/theme-selva/www/selva-site-master">
   <property name="header_stuff">
-  @header_stuff;noquote@
+    @header_stuff;noquote@
   </property>
   <if @context@ not nil><property name="context">@context;noquote@</property></if>
     <else><if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if></else>
   <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-  <if @title@ not nil><property name="title">@title;noquote@</property></if>
   <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
- <br /> 
+ 
+
+<if @youarehere@ not nil><div id="youarehere">@youarehere;noquote@</div><br /></if> 
+
 <div id="portal-navigation">
-  <if @subnavbar@ not nil>@subnavbar;noquote@</if> 
+<if @navbar@ not nil>@navbar;noquote@</if> 
 </div> <!-- end of  portal-navigation-->
-<if navbar ne "">
-      <div id="portal-subnavigation">
+
+<div id="portal-subnavigation">
 	<div id="portal-subnavigation-links">
-	  <if @navbar@ not nil>@navbar;noquote@</if> 	
+	<if @subnavbar@ not nil>@subnavbar;noquote@</if> 	
 	</div>
+	
 </div>
-      </if>
-      <div id="portal">
-<if @in_dotlrn_p@ ne 1><h3 align="center">@title;noquote@</h3></if>
 
-<slave>
-	  <div style="clear: both;"></div>
-      </div>
+<div id="portal">
+  
+
+  <slave>
+  <div style="clear: both;"></div>
+</div>
+
 <div id="portal-bottom"></div>
+
 <div id="footer">
   <a href="http://www.dotlrn.org">.LRN Home</a> |
   <a href="http://www.openacs.org/projects/dotlrn">.LRN Project Central</a>
 </div>
-