Index: openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.adp	14 Mar 2004 01:16:30 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-element.adp	14 Mar 2004 03:38:25 -0000	1.2
@@ -19,17 +19,11 @@
 %>
 
 <master src="@element.filename@">
-<property name="header_stuff">
-  <link rel="stylesheet" type="text/css" href="/resources/portal/@element.resource_dir@/portal.css" media="all"/>
-</property>
 <property name="name">@element.name;noquote@</property>
 <property name="dir">@element.resource_dir;noquote@</property>
 <property name="element_id">@element.element_id;noquote@</property>
 <property name="shadeable_p">@element.shadeable_p;noquote@</property>
 <property name="shaded_p">@element.shaded_p;noquote@</property>
 <property name="hideable_p">@element.hideable_p;noquote@</property>
 
-<ul>
-<li><b>@element.name@</b><br>
-<li><include src="@element.template_path@" cf="@element.config@">
-</ul>
+<include src="@element.template_path@" cf="@element.config@">
Index: openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-page.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-page.adp	14 Mar 2004 03:38:25 -0000	1.1
@@ -0,0 +1,9 @@
+<if @elements_exist_p@>
+  <include src="@page.layout_filename;noquote@"
+           element_list="@page.element_list;noquote@"
+           element_src="@page.element_src;noquote@"
+           portal_id="@page.portal_id@"
+           edit_p="@edit_p@"
+           page_id="@page_id@"
+           layout_id="@page.layout_id@">
+</if>
Index: openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-page.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-page.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/lib/render-styles/all-in-one/render-page.tcl	14 Mar 2004 03:38:25 -0000	1.1
@@ -0,0 +1,35 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# render-page.tcl
+
+ad_page_contract {
+
+    Render a portal page.
+
+    This is intended to be included, not called directly, with the following parameters
+    defined:
+
+    @param page_id The portal the page belongs to
+
+    @author Don Baccus (dhogaza@pacifier.com)
+    @creation-date 2004/01/24
+    @cvs_id $Id: render-page.tcl,v 1.1 2004/03/14 03:38:25 donb Exp $
+
+}
+
+array set page [portal::page::get_render_data -render_style all-in-one -page_id $page_id]
+set elements_exist_p [expr {[llength $page(element_list)] > 0}]
Index: openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.tcl	14 Mar 2004 01:16:30 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/render-styles/individual/render-page.tcl	14 Mar 2004 03:38:27 -0000	1.2
@@ -31,5 +31,5 @@
 
 }
 
-array set page [portal::page::get_render_data -page_id $page_id]
+array set page [portal::page::get_render_data -render_style individual -page_id $page_id]
 set elements_exist_p [expr {[llength $page(element_list)] > 0}]
Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	14 Mar 2004 01:16:32 -0000	1.19
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	14 Mar 2004 03:38:27 -0000	1.20
@@ -693,11 +693,18 @@
      
             # create the master template
 
-            portal::new -name "Shared Portal" -owner_id 0 -owner_privileges {}
+            portal::new \
+                -name "Shared Portal" \
+                -owner_id 0 \
+                -owner_privileges {} \
      
             # create the admin template
 
-            portal::new -name "Administration" -owner_id [ad_conn package_id] -owner_privileges {}
+            portal::new \
+                -name "Administration" \
+                -owner_id [ad_conn package_id] \
+                -theme_name blank \
+                -owner_privileges {}
     
         }
     }
Index: openacs-4/contrib/packages/portal/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/www/index.tcl	14 Mar 2004 01:19:10 -0000	1.1
+++ openacs-4/contrib/packages/portal/www/index.tcl	14 Mar 2004 03:38:28 -0000	1.2
@@ -79,25 +79,28 @@
     permission::require_permission -privilege read -object_id $portal_id
     set admin_p [permission::permission_p -object_id $portal_id -privilege admin]
     set edit_p [permission::permission_p -object_id $portal_id -privilege write]
+    set render_style individual
 } else {
     # Gotta be an admin to use the admin portal, and it's not configurable so
     # we set edit_0
     permission::require_permission -privilege admin -object_id $portal_id
     set admin_p 1
     set edit_p 0
+    set render_style all-in-one
 }
 
-array set portal [portal::get_render_data -portal_id $portal_id -page_num $page_num]
+array set portal [portal::get_render_data \
+                     -portal_id $portal_id \
+                     -render_style $render_style \
+                     -page_num $page_num]
 
 db_multirow -unclobber -extend {url} navbar select_user_navbar {} {
     set url [export_vars -base index {portal_id page_num}]
-ns_log Notice "Huh? user url: $url"
 }
 
 if { $admin_p } {
     db_multirow -unclobber -append -extend {url} navbar select_admin_navbar {} {
         set url [export_vars -base index {portal_id page_num}]
-ns_log Notice "Huh? admin url: $url"
     }
 }