Index: openacs-4/contrib/packages/portal/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/www/index.adp	14 Mar 2004 01:19:10 -0000	1.1
+++ openacs-4/contrib/packages/portal/www/index.adp	17 Mar 2004 02:15:53 -0000	1.2
@@ -1,23 +1,12 @@
-<master>
+<if @master_template@ eq "">
+  <master>
+</if>
+<else>
+  <master src="@master_template@">
+</else>
 
-  <div id="@which_navbar@-div">
-    <div id="@which_navbar@-container">
-      <div id="@which_navbar@"> 
-        <multiple name="navbar">
-          <if @navbar.page_num@ eq @page_num@ and @navbar.portal_id@ eq @portal_id@>
-            <div class="tab" id="@which_navbar@-here">
-              @navbar.name@
-            </div>
-          </if>
-          <else>
-            <div class="tab">
-               <a href="@navbar.url@" title="@navbar.name@">@navbar.name@</a>
-            </div>
-          </else>
-        </multiple>
-      </div>
-    </div>
-  </div>
-  <div id="@which_navbar@-body">
+<property name="page_num">@page_num@</property>
+<property name="portal_id">@portal_id@</property>
+<property name="user_portal_id">@user_portal_id@</property>
 
-<include src="@portal.page_src@" page_id="@portal.page_id@" edit_p="@edit_p@">
+<include src="/packages/portal/lib/render-portal" portal_id="@portal_id@" page_num="@page_num@">