Index: openacs-4/contrib/packages/portal/lib/configure-subsite-integration.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/configure-subsite-integration.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/lib/configure-subsite-integration.tcl	24 Mar 2004 00:03:36 -0000	1.3
+++ openacs-4/contrib/packages/portal/lib/configure-subsite-integration.tcl	26 Mar 2004 02:58:57 -0000	1.4
@@ -53,14 +53,19 @@
         1 {parameter::set_value \
              -parameter DefaultMaster \
              -package_id [ad_conn subsite_id] \
-             -value /packages/acs-subsite/www/group-master
+             -value /packages/portal/lib/nested-tabbed-master
 
            parameter::set_value \
              -parameter OurMasterTemplate \
              -package_id [ad_conn package_id] \
-             -value /packages/portal/lib/plain-master
+             -value /packages/portal/lib/nested-tabbed-master
 
            parameter::set_value \
+             -parameter SiteMasterTemplate \
+             -package_id [ad_conn package_id] \
+             -value /www/site-master
+
+           parameter::set_value \
              -parameter NavbarClass \
              -package_id [ad_conn package_id] \
              -value subnavbar
Index: openacs-4/contrib/packages/portal/lib/nested-tabbed-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/nested-tabbed-master.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/nested-tabbed-master.adp	26 Mar 2004 02:58:57 -0000	1.1
@@ -0,0 +1,126 @@
+<master src="@master_template@">
+  <if @title@ not nil>
+    <property name="title">@title;noquote@</property>
+  </if>
+  <if @signatory@ not nil>
+    <property name="signatory">@signatory;noquote@</property>
+  </if>
+  <if @focus@ not nil>
+    <property name="focus">@focus;noquote@</property>
+  </if>
+  <property name="header_stuff">
+    @header_stuff;noquote@
+    <!--<link rel="stylesheet" type="text/css" href="@css_url@" media="all">-->
+  </property>
+
+<div id="subsite-name">
+  <if @subsite_url@ not nil><a href="@subsite_url@" class="subsite-name">@subsite_name@</a></if>
+  <else>@subsite_name@</else>
+</div>
+
+<!-- Top level navigation -->
+
+<div id="navbar-div">
+  <div id="navbar-container">
+    <div id="navbar"> 
+      <multiple name="sections">
+        <if @sections.selected_p@ true>
+          <div class="tab" id="navbar-here">
+            <if @sections.link_p@ true>
+              <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
+            </if>
+            <else>        
+              @sections.label@
+            </else>
+          </div>
+        </if>
+        <else>
+          <div class="tab">
+            <if @sections.link_p@ true>
+              <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
+            </if>
+            <else>        
+              @sections.label@
+            </else>
+          </div>
+        </else>
+      </multiple>
+    </div>
+  </div>
+</div>
+<div id="navbar-body">
+
+<!-- Second level navigation -->
+
+  <if @subsections:rowcount@ gt 0 or @package_id@ ne "">
+    <div id="subnavbar-div">
+      <div id="subnavbar-container">
+        <div id="subnavbar">
+          <if @subsections:rowcount@ gt 0>
+            <multiple name="subsections">
+              <if @subsections.selected_p@ true>
+                <div class="tab" id="subnavbar-here">
+                  <if @subsections.link_p@ true>
+                    <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
+                  </if>
+                  <else>        
+                    @subsections.label@
+                  </else>
+                </div>
+              </if>
+              <else>
+                <div class="tab">
+                  <if @subsections.link_p@ true>
+                    <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
+                  </if>
+                  <else>        
+                    @subsections.label@
+                  </else>
+                </div>
+              </else>
+            </multiple>
+          </if>
+          <elseif @package_id@ ne "">
+            <multiple name="portal_pages">
+              <if @page_num@ not nil and @portal_pages.page_num@ eq @page_num@
+                 and @portal_id@ not nil and @portal_pages.portal_id@ eq @portal_id@>
+                <div class="tab" id="subnavbar-here">
+                  @portal_pages.name@
+                </div>
+              </if>
+              <else>
+                <div class="tab">
+                  <a href="@portal_pages.url@" title="@portal_pages.name@">@portal_pages.name@</a>
+                </div>
+              </else>
+            </multiple>
+            <if @application@ not nil>
+              <div class="tab" id="subnavbar-here">
+                @application@
+              </div>
+            </if>
+          </elseif>
+        </div>
+      </div>
+    </div>
+    <div id="subnavbar-body">
+  </if>
+
+  <!-- Body -->
+
+  <if @portal_page_p@>
+    <slave>
+  </if>
+  <else>
+    <include src="@theme_filename@" dir="@theme_resource_dir@" name="@title@" shadeable_p="f" hideable_p="f" &="__adp_slave">
+  </else>
+
+  <div style="clear: both;"></div>
+
+  <if @subsections:rowcount@ gt 0 or @package_id ne "">
+    </div>
+  </if>
+</div>
+
+
+ 
Index: openacs-4/contrib/packages/portal/lib/nested-tabbed-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/nested-tabbed-master.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/nested-tabbed-master.tcl	26 Mar 2004 02:58:57 -0000	1.1
@@ -0,0 +1,84 @@
+# Expects properties:
+#   title
+#   focus
+#   header_stuff
+#   section
+#   subnavbar_link
+
+if { ![info exists section] } {
+    set section {}
+}
+
+if { ![info exists header_stuff] } {
+    set header_stuff {}
+}
+
+if { ![info exists subnavbar_link] } {
+    set subnavbar_link {}
+}
+
+if { ![info exists title] } {
+    set title ""
+}
+
+set subsite_node_id [site_node::get_node_id_from_object_id -object_id [ad_conn subsite_id]]
+set portal_url [lindex [site_node::get_children -node_id $subsite_node_id -package_key portal] 0]
+
+set package_id [site_node::get_object_id -node_id [site_node::get_node_id -url $portal_url]]
+set package_node_id [site_node::get_node_id_from_object_id -object_id $package_id]
+set portal_page_p 0
+
+set user_portal_id [portal::get_user_portal_id -package_id $package_id]
+set which_navbar [parameter::get -package_id $package_id -parameter NavbarClass]
+set portal_url [site_node::get_url_from_object_id -object_id $package_id]
+array set theme [portal::theme::get -theme_id [portal::get_theme_id -portal_id $user_portal_id]]
+set theme_filename $theme(filename)
+set theme_resource_dir $theme(resource_dir)
+set master_template [parameter::get -package_id $package_id -parameter SiteMasterTemplate]
+
+db_multirow -unclobber -extend {url} portal_pages select_user_portal_pages {} {
+    set url [export_vars -base $portal_url {portal_id page_num}]
+    if { [string equal $url $portal_url] } {
+        set portal_page_p 1
+    }
+}
+
+if { [permission::permission_p \
+         -object_id [portal::get_admin_portal_id -package_id $package_id] \
+         -privilege admin] } {
+    db_multirow -unclobber -append -extend {url} portal_pages select_admin_portal_pages {} {
+        set url [export_vars -base $portal_url {portal_id page_num}]
+        if { [string equal $url $portal_url] } {
+            set portal_page_p 1
+        }
+    }
+}
+
+array set site_node [site_node::get_from_url \
+                        -url [ad_conn package_url] \
+                        -exact]
+
+if { $site_node(parent_id) == $package_node_id } {
+    set application $site_node(instance_name)
+} elseif {$site_node(object_id) == $package_id } {
+    set portal_page_p 1
+}
+
+
+# This will set 'sections' and 'subsections' multirows
+subsite::define_pageflow -section $section
+subsite::get_section_info -array section_info
+
+# Find the subsite we belong to
+set subsite_url [site_node_closest_ancestor_package_url]
+array set subsite_sitenode [site_node::get -url $subsite_url]
+set subsite_node_id $subsite_sitenode(node_id)
+set subsite_name $subsite_sitenode(instance_name)
+
+# Where to find the stylesheet
+set css_url "/resources/acs-subsite/group-master.css"
+
+if { [string equal [ad_conn url] $subsite_url] } {
+    set subsite_url {}
+}
+
Index: openacs-4/contrib/packages/portal/lib/nested-tabbed-master.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/nested-tabbed-master.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/nested-tabbed-master.xql	26 Mar 2004 02:58:57 -0000	1.1
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+  <fullquery name="select_user_portal_pages">
+    <querytext>
+      select name, sort_key as page_num, portal_id
+      from portal_pages
+      where portal_id = :user_portal_id
+      order by sort_key
+    </querytext>
+  </fullquery>
+
+
+  <fullquery name="select_admin_portal_pages">
+    <querytext>
+      select name, 0 as page_num, portal_id
+      from portals
+      where owner_id = :package_id
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/contrib/packages/portal/lib/plain-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/plain-master.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/lib/plain-master.tcl	24 Mar 2004 00:03:36 -0000	1.3
+++ openacs-4/contrib/packages/portal/lib/plain-master.tcl	26 Mar 2004 02:58:57 -0000	1.4
@@ -13,6 +13,8 @@
                    -package_key portal \
                    -include_self]
 
+ns_log Notice "Huh? package_id: $package_id"
+
 set show_single_button_navbar_p [parameter::get \
                                     -package_id $package_id \
                                     -parameter ShowSingleButtonNavbar]
@@ -39,6 +41,7 @@
                             -url [ad_conn package_url] \
                             -exact]
 
+ns_log Notice "Huh? object_id: $site_node(object_id)"
     if { $site_node(object_id) != $package_id } {
         set application $site_node(instance_name)
     }
Index: openacs-4/contrib/packages/portal/lib/tabbed-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/tabbed-master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/portal/lib/tabbed-master.adp	19 Mar 2004 00:41:22 -0000	1.4
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.adp	26 Mar 2004 02:58:57 -0000	1.5
@@ -39,7 +39,7 @@
         </multiple>
       </if>
       <multiple name="sections">
-        <if @portal_url@ not nil and @sections.url@ ne @portal_url@.>
+        <if @portal_url@ not nil and @sections.url@ ne @portal_url@>
           <if @sections.selected_p@ true>
             <div class="tab" id="navbar-here">
               <if @sections.link_p@ true>
@@ -106,8 +106,6 @@
     </div>
     <div id="subnavbar-body">
   </if>
-  <else>
-  </else>
 
   <!-- Body -->
 
@@ -124,6 +122,3 @@
     </div>
   </if>
 </div>
-
-
- 
Index: openacs-4/contrib/packages/portal/lib/tabbed-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/tabbed-master.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/portal/lib/tabbed-master.tcl	21 Mar 2004 02:39:56 -0000	1.5
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.tcl	26 Mar 2004 02:58:57 -0000	1.6
@@ -57,9 +57,6 @@
 array set site_node [site_node::get_from_url \
                         -url [ad_conn package_url] \
                         -exact]
-set foo [site_node::get_from_url \
-                        -url [ad_conn package_url] \
-                        -exact]
 
 if { $site_node(parent_id) == $package_node_id } {
     set application $site_node(instance_name)