Index: openacs-4/contrib/packages/portal/lib/plain-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/plain-master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/plain-master.adp	17 Mar 2004 02:15:52 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/plain-master.adp	18 Mar 2004 00:31:32 -0000	1.2
@@ -1,7 +1,4 @@
 <master src="/www/site-master">
-  <if @title@ not nil>
-    <property name="title">@title;noquote@</property>
-  </if>
   <if @signatory@ not nil>
     <property name="signatory">@signatory;noquote@</property>
   </if>
@@ -17,16 +14,16 @@
     <div id="@which_navbar@-div">
       <div id="@which_navbar@-container">
         <div id="@which_navbar@"> 
-          <multiple name="navbar">
-            <if @page_num@ not nil and @navbar.page_num@ eq @page_num@
-                and @portal_id@ not nil and @navbar.portal_id@ eq @portal_id@>
+          <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="@which_navbar@-here">
-                @navbar.name@
+                @portal_pages.name@
               </div>
             </if>
             <else>
               <div class="tab">
-                 <a href="@navbar.url@" title="@navbar.name@">@navbar.name@</a>
+                 <a href="@portal_pages.url@" title="@portal_pages.name@">@portal_pages.name@</a>
               </div>
             </else>
           </multiple>
@@ -40,6 +37,14 @@
     </div>
     <div id="@which_navbar@-body">
   </if>
+
+  <!-- Page Title -->
+
+    <if @title@ not nil>
+      <h1 class="page-title">@title@</h1>
+    </if>
+
+  <!-- Body -->
   
   <slave>
 
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.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/plain-master.tcl	17 Mar 2004 02:15:52 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/plain-master.tcl	18 Mar 2004 00:31:32 -0000	1.2
@@ -19,14 +19,14 @@
     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]
 
-    db_multirow -unclobber -extend {url} navbar select_user_navbar {} {
+    db_multirow -unclobber -extend {url} portal_pages select_user_portal_pages {} {
         set url [export_vars -base $portal_url {portal_id page_num}]
     }
 
     if { [permission::permission_p \
              -object_id [portal::get_admin_portal_id -package_id $package_id] \
              -privilege admin] } {
-        db_multirow -unclobber -append -extend {url} navbar select_admin_navbar {} {
+        db_multirow -unclobber -append -extend {url} portal_pages select_admin_portal_pages {} {
             set url [export_vars -base $portal_url {portal_id page_num}]
         }
     }
@@ -41,4 +41,3 @@
 
 }
 
-ad_return_template
Index: openacs-4/contrib/packages/portal/lib/plain-master.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/plain-master.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/plain-master.xql	17 Mar 2004 02:15:52 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/plain-master.xql	18 Mar 2004 00:31:32 -0000	1.2
@@ -2,7 +2,7 @@
 
 <queryset>
 
-  <fullquery name="select_user_navbar">
+  <fullquery name="select_user_portal_pages">
     <querytext>
       select name, sort_key as page_num, portal_id
       from portal_pages
@@ -12,7 +12,7 @@
   </fullquery>
 
 
-  <fullquery name="select_admin_navbar">
+  <fullquery name="select_admin_portal_pages">
     <querytext>
       select name, 0 as page_num, portal_id
       from portals
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.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/tabbed-master.adp	17 Mar 2004 02:15:52 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.adp	18 Mar 2004 00:31:32 -0000	1.2
@@ -23,28 +23,50 @@
 <div id="navbar-div">
   <div id="navbar-container">
     <div id="navbar"> 
+      <if @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="@which_navbar@-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>
       <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 @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>
+                <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>
         </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>
+      <if @application@ not nil>
+        <div class="tab" id="@which_navbar@-here">
+          @application@
+        </div>
+      </if>
     </div>
   </div>
 </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.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/tabbed-master.tcl	17 Mar 2004 02:15:52 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.tcl	18 Mar 2004 00:31:32 -0000	1.2
@@ -5,8 +5,6 @@
 #   section
 #   subnavbar_link
 
-ns_log Notice "Huh? starting master ..."
-
 if { ![info exists section] } {
     set section {}
 }
@@ -19,31 +17,43 @@
     set subnavbar_link {}
 }
 
-set subsite_id [ad_conn subsite_id]
-db_1row select_package_id {}
+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]
 
-ns_log Notice "Huh? package_id: $package_id"
-set user_portal_id [portal::get_user_portal_id -package_id $package_id]
-if { ![info exists portal_id] } {
-    set portal_id $user_portal_id
-}
+set package_id [site_node::get_object_id -node_id [site_node::get_node_id -url $portal_url]]
 
-db_multirow -unclobber -extend {url} navbar select_user_navbar {} {
-    set url [export_vars -base index {page_num page_num}]
-}
+if { ![string equal $package_id ""] } {
 
-if { [permission::permission_p \
-        -object_id [portal::get_admin_portal_id -package_id $package_id] \
-        -privilege admin] } {
-    db_multirow -unclobber -append -extend {url} navbar select_admin_navbar {} {
-        set url [export_vars -base index {portal_id page_num}]
+    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]
+
+    db_multirow -unclobber -extend {url} portal_pages select_user_portal_pages {} {
+        set url [export_vars -base $portal_url {portal_id page_num}]
     }
+
+    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}]
+        }
+    }
+
+    array set site_node [site_node::get_from_url \
+                            -url [ad_conn package_url] \
+                            -exact]
+
+    if { $site_node(parent_id) == $package_id } {
+        set application $site_node(instance_name)
+    }
+
 }
-ns_log Notice "Huh? done with portal part of master ..."
 
+
 # This will set 'sections' and 'subsections' multirows
-subsite_integration::define_pageflow -section $section
-subsite_integration::get_section_info -array section_info
+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]
@@ -57,4 +67,4 @@
 if { [string equal [ad_conn url] $subsite_url] } {
     set subsite_url {}
 }
-ns_log Notice "Huh? done with master ..."
+
Index: openacs-4/contrib/packages/portal/lib/tabbed-master.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/tabbed-master.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/tabbed-master.xql	17 Mar 2004 02:15:52 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.xql	18 Mar 2004 00:31:32 -0000	1.2
@@ -2,7 +2,7 @@
 
 <queryset>
 
-  <fullquery name="select_user_navbar">
+  <fullquery name="select_user_portal_pages">
     <querytext>
       select name, sort_key as page_num, portal_id
       from portal_pages
@@ -12,7 +12,7 @@
   </fullquery>
 
 
-  <fullquery name="select_admin_navbar">
+  <fullquery name="select_admin_portal_pages">
     <querytext>
       select name, 0 as page_num, portal_id
       from portals
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/tcl/subsite-integration-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/tcl/subsite-integration-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?