Index: openacs-4/packages/theme-selva/www/selva-site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-selva/www/selva-site-master.adp	26 Jul 2005 15:52:53 -0000	1.2
+++ openacs-4/packages/theme-selva/www/selva-site-master.adp	26 Jul 2005 16:37:51 -0000	1.3
@@ -13,49 +13,6 @@
     <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
       @header_stuff;noquote@
   </property>
-<div id="wrapper">
-  <!-- header (contains logo) -->
-  <div id="header">
-    <img src="/resources/theme-selva/Selva/default/images/logo.gif" />
-  </div>
-  <!-- Header -->
-  <div id="site-header">
-    <div id="breadcrumbs">
-      <!-- displays "you are here" -->
-      <div id="context-bar">
-	<if @context_bar@ not nil>
-	  <div id="breadcrumbs">@context_bar;noquote@</div>
-	</if>
-	<else>
-	  <if @context:rowcount@ not nil>
-	    <multiple name="context">
-	      <if @context.url@ not nil>
-		<a href="@context.url@">@context.label@</a> &#187;
-	      </if>
-	      <else>
-		@context.label@
-	      </else>
-	    </multiple>
-	  </if>
-	</else>
-	<div id="navlinks">@subnavbar_link;noquote@</div>
-	<div style="clear: both;">
-	</div>
-      </div>
-      <!-- user greeting -->
-      <div class="user-greeting">
-	<if @untrusted_user_id@ ne 0>
-	  #acs-subsite.Welcome_user#
-	</if>
-	<else>
-	  #acs-subsite.Not_logged_in#
-	</else>
-      </div>
-    </div>
-    <!-- end of status -->
-  </div>
-  <!-- end of breadcrumbs -->
-</div>
 <if @user_messages:rowcount@ gt 0>
   <div id="user-message">
     <ul>
@@ -65,24 +22,43 @@
     </ul>
   </div>
 </if>
-<slave>
-  <div id="footer">
-    <div class="action-list">
-      <if @num_of_locales@ gt 1>
-	<a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a>
+<div id="breadcrumbs">
+  <!-- displays "you are here" -->
+  <div id="context-bar">
+    <if @context_bar@ not nil>
+      <div id="breadcrumbs">@context_bar;noquote@</div>
+    </if>
+    <else>
+      <if @context:rowcount@ not nil>
+	<multiple name="context">
+	  <if @context.url@ not nil>
+	    <a href="@context.url@">@context.label@</a> &#187;
+	  </if>
+	  <else>
+	    @context.label@
+	  </else>
+	</multiple>
       </if>
-      <else>
-	<if @locale_admin_url@ not nil>
-	  <a href="@locale_admin_url@">Install locales</a>
-	</if>
-      </else>
-      <a href="/doc/theme-selva/">Documentation on this theme</a>
-    </div>
+    </else>
   </div>
-  <if @curriculum_bar_p@ true>
-    <p>
-      <include
-	src="/packages/curriculum/lib/bar" />
-  </if>
-</div>
+    <slave>
+      <div id="footer">
+	<div class="action-list">
+	  <if @num_of_locales@ gt 1>
+	    <a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a>
+	  </if>
+	  <else>
+	    <if @locale_admin_url@ not nil>
+	      <a href="@locale_admin_url@">Install locales</a>
+	    </if>
+	  </else>
+	  <a href="/doc/theme-selva/">Documentation on this theme</a>
+	</div>
+      </div>
+      <if @curriculum_bar_p@ true>
+	<p>
+	  <include
+	    src="/packages/curriculum/lib/bar" />
+      </if>
+  </div>
   <!-- end of wrapper -->
\ No newline at end of file