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.6 -r1.7
--- openacs-4/packages/theme-selva/www/selva-master.adp	18 Sep 2005 12:27:08 -0000	1.6
+++ openacs-4/packages/theme-selva/www/selva-master.adp	26 Sep 2005 04:37:06 -0000	1.7
@@ -1,36 +1,8 @@
-<master src="/packages/theme-selva/www/selva-site-master">
-  <property name="header_stuff">
-    @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 @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
- 
+<if @dotlrn_installed_p@ eq 1>
+	<master src="/packages/theme-selva/www/selva-lrn-master">
+</if>
+<else>
+	<master src="/packages/theme-selva/www/selva-site-master">
+</else>
 
-<if @youarehere@ not nil><div id="youarehere">@youarehere;noquote@</div><br /></if> 
-
-<div id="portal-navigation">
-<if @navbar@ not nil>@navbar;noquote@</if> 
-</div> <!-- end of  portal-navigation-->
-
-<div id="portal-subnavigation">
-	<div id="portal-subnavigation-links">
-	<if @subnavbar@ not nil>@subnavbar;noquote@</if> 	
-	</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>
+<slave>