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 -N -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/lib/tabbed-master.adp	18 Mar 2004 00:31:32 -0000	1.2
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.adp	18 Mar 2004 18:14:13 -0000	1.3
@@ -109,17 +109,17 @@
   <else>
   </else>
 
-<!-- Page Title -->
+  <!-- Body -->
 
-    <if @title@ not nil>
-      <h1 class="page-title">@title@</h1>
-    </if>
-
-<!-- Body -->
-
+  <if @portal_page_p@>
     <slave>
-    <div style="clear: both;"></div>
+  </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>
     </div>
   </if>
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 -N -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/lib/tabbed-master.tcl	18 Mar 2004 00:31:32 -0000	1.2
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.tcl	18 Mar 2004 18:14:13 -0000	1.3
@@ -17,26 +17,40 @@
     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 portal_page_p 0
 
 if { ![string equal $package_id ""] } {
 
     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)
 
     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
+            }
         }
     }
 
@@ -46,6 +60,8 @@
 
     if { $site_node(parent_id) == $package_id } {
         set application $site_node(instance_name)
+    } elseif {$site_node(object_id) == $package_id } {
+        set portal_page_p 1
     }
 
 }
Index: openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	18 Mar 2004 00:51:13 -0000	1.7
+++ openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	18 Mar 2004 18:14:14 -0000	1.8
@@ -21,7 +21,7 @@
         }
     }
 
-    source datasource-procs.tcl
+    apm_source [acs_root_dir]/packages/portal/tcl/datasource-procs.tcl
 
     # Now define some default layouts.
 
@@ -82,23 +82,23 @@
         {name default}
         {description "Default OpenACS Theme"}
         {filename themes/standard-theme}
-        {resource_dir themes/standard-theme}
+        {resource_dir /resources/portal/themes/standard-theme}
     }
     package_instantiate_object -var_list $var_list portal_theme
 
     set var_list {
         {name blank}
         {description "No graphics"}
         {filename themes/nada-theme}
-        {resource_dir themes/nada-theme}
+        {resource_dir /resources/portal/themes/nada-theme}
     }
     package_instantiate_object -var_list $var_list portal_theme
 
     set var_list {
         {name deco}
         {description "An Art Deco Theme"}
         {filename themes/deco-theme}
-        {resource_dir themes/deco-theme}
+        {resource_dir /resources/portal/themes/deco-theme}
     }
     package_instantiate_object -var_list $var_list portal_theme
     
Index: openacs-4/contrib/packages/portal/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/element-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/contrib/packages/portal/tcl/element-procs.tcl	18 Mar 2004 01:03:03 -0000	1.13
+++ openacs-4/contrib/packages/portal/tcl/element-procs.tcl	18 Mar 2004 18:14:14 -0000	1.14
@@ -418,7 +418,7 @@
             ] \
         ]
         set element(filename) "/packages/portal/lib/$theme(filename)"
-        set element(resource_dir) "/resources/portal/$theme(resource_dir)"
+        set element(resource_dir) "$theme(resource_dir)"
 
         if {!$edit_p} {
             set element(shadeable_p) f
Index: openacs-4/contrib/packages/portal/tcl/theme-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/theme-procs.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/contrib/packages/portal/tcl/theme-procs.xql	14 Mar 2004 01:16:32 -0000	1.5
+++ openacs-4/contrib/packages/portal/tcl/theme-procs.xql	18 Mar 2004 18:14:14 -0000	1.6
@@ -18,4 +18,12 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::theme::get_filename.select_filename">
+        <querytext>
+            select filename
+            from portal_themes
+            where theme_id = :theme_id
+        </querytext>
+    </fullquery>
+
 </queryset>