Index: openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl	15 Jan 2002 22:23:41 -0000	1.14
+++ openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl	21 Jan 2002 06:30:11 -0000	1.15
@@ -22,7 +22,7 @@
 
     ad_proc -public get_pretty_name {
     } {
-        return "My Groups"
+        return [ad_parameter dotlrn_main_portlet_pretty_name]
     }
 
     ad_proc -public link {
@@ -59,30 +59,11 @@
         @author ben@openforce.net
         @creation-date Nov 2001
     } {
-        array set config $cf        
-
-        set user_id [ad_get_user_id]
-
-        # This is not templated. OH NO. I am a horrible, horrible,
-        # little man. (ben)
-
-        set return_html "<table border=0 cellpadding=2 cellspacing=2 width=100%>"
-        set communities [dotlrn_community::get_all_communities_by_user $user_id]
-
-        foreach community $communities {
-            set url [dotlrn_community::get_url_from_package_id -package_id [lindex $community 4]]
-            set name [lindex $community 3]
-
-            append return_html "<tr><td><a href=\"${url}\"><b>${name}</b></a></td></tr>\n"
-        }
-
-        if {[dotlrn::user_can_browse_p $user_id]} {
-            append return_html "<tr><td><p></p></td></tr>\n"
-            append return_html "<tr><td><small><a href=\"all-communities\">\[Subscribe to a new community\]</a></small></td></tr>\n"
-        }
-
-        append return_html "</table>"
-        return $return_html
+        # no return call required with the helper proc
+        portal::show_proc_helper \
+                -template_src "dotlrn-main-portlet" \
+                -package_key "dotlrn" \
+                -config_list $cf
     }   
 
     ad_proc -public edit { 
Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl	11 Jan 2002 21:51:50 -0000	1.12
+++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl	21 Jan 2002 06:30:11 -0000	1.13
@@ -50,13 +50,20 @@
 	    if {$rel_type == "dotlrn_full_user_rel"} {
 		# Create a portal page for this user
 		set portal_id [portal::create -name "Your dotLRN Workspace" $user_id]
-		
-		# Add the basic dotLRN class listing portlet
-		dotlrn_main_portlet::add_self_to_page $portal_id {}
-		
-		# Update the user and set the portal page correctly
-		ns_set put $extra_vars portal_id $portal_id
+
+                # XXX AKS - portals having problems with the following
+                # two lines - if the next line is taken out of the
+                # transaction, it full acc user add works, but lim acc
+                # user add dosent. weird!!!!
+                # Add the basic dotLRN class listing portlet
+                # XXXX
                 
+                dotlrn_main_portlet::add_self_to_page $portal_id {}
+
+                # end XXXX
+
+                # Update the user and set the portal page correctly
+		ns_set put $extra_vars portal_id $portal_id
 	    }
 
 	    # Add the relation (no need to feed in anything for object_id_one, or two for that matter).
Index: openacs-4/packages/dotlrn/www/all-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/all-communities.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/all-communities.adp	19 Jan 2002 22:54:20 -0000	1.2
+++ openacs-4/packages/dotlrn/www/all-communities.adp	21 Jan 2002 06:30:11 -0000	1.3
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">All Communities</property>
+<property name="portal_id">@portal_id@</property>
 
 <p></p>
 
Index: openacs-4/packages/dotlrn/www/all-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/all-communities.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/all-communities.tcl	15 Jan 2002 22:23:41 -0000	1.1
+++ openacs-4/packages/dotlrn/www/all-communities.tcl	21 Jan 2002 06:30:11 -0000	1.2
@@ -9,6 +9,7 @@
     context_bar:onevalue
 }
 
+set portal_id ""
 set context_bar {{All Communities}}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/applets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/applets.adp	19 Jan 2002 22:54:20 -0000	1.1
+++ openacs-4/packages/dotlrn/www/applets.adp	21 Jan 2002 06:30:11 -0000	1.2
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">Manage Applets</property>
 <property name="context_bar">@context_bar@</property>
+<property name="portal_id">@portal_id@</property>
 
 <include src="applets-chunk">
Index: openacs-4/packages/dotlrn/www/applets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/applets.tcl	20 Jan 2002 19:43:46 -0000	1.2
+++ openacs-4/packages/dotlrn/www/applets.tcl	21 Jan 2002 06:30:11 -0000	1.3
@@ -6,7 +6,7 @@
     @version $Id$
 } -query {
 }
-
+set portal_id ""
 set context_bar {{"one-community-admin" Admin} {Manage Applets}}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-type.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/community-type.adp	20 Jan 2002 22:25:42 -0000	1.3
+++ openacs-4/packages/dotlrn/www/community-type.adp	21 Jan 2002 06:30:11 -0000	1.4
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">dotLRN: @pretty_name@</property>
+<property name="portal_id">@portal_id@</property>
 
 <p></p>
 
Index: openacs-4/packages/dotlrn/www/community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-type.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/community-type.tcl	20 Jan 2002 19:43:46 -0000	1.2
+++ openacs-4/packages/dotlrn/www/community-type.tcl	21 Jan 2002 06:30:11 -0000	1.3
@@ -7,6 +7,8 @@
 } -query {
 }
 
+set portal_id ""
+
 # Check that this is a community type
 if {[ad_parameter community_type_level_p] != 1} {
     ad_returnredirect "./"
Index: openacs-4/packages/dotlrn/www/community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/community.adp	19 Jan 2002 17:26:07 -0000	1.4
+++ openacs-4/packages/dotlrn/www/community.adp	21 Jan 2002 06:30:11 -0000	1.5
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@pretty_name@</property>
+<property name="portal_id">@portal_id@</property>
 
 [
   <font size="-1">
Index: openacs-4/packages/dotlrn/www/community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/community.tcl	20 Jan 2002 19:43:46 -0000	1.2
+++ openacs-4/packages/dotlrn/www/community.tcl	21 Jan 2002 06:30:11 -0000	1.3
@@ -6,6 +6,7 @@
 } -query {
 }
 
+set portal_id ""
 ns_log Notice "BEN TEST!"
 
 
Index: openacs-4/packages/dotlrn/www/configure-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/configure-element.adp	9 Nov 2001 18:12:55 -0000	1.1
+++ openacs-4/packages/dotlrn/www/configure-element.adp	21 Jan 2002 06:30:11 -0000	1.2
@@ -1,5 +1,7 @@
 <master src="master">
 <property name="title">Configure Element</property>
-<p>
+<property name="portal_id">@portal_id@</property>
 
+<p></p>
+
 @rendered_page@
Index: openacs-4/packages/dotlrn/www/configure-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/configure-element.tcl	20 Jan 2002 19:43:46 -0000	1.3
+++ openacs-4/packages/dotlrn/www/configure-element.tcl	21 Jan 2002 06:30:11 -0000	1.4
@@ -10,6 +10,8 @@
     op:notnull
 }
 
+set portal_id ""
+
 # Check if this is a community type level thing
 if {[ad_parameter community_type_level_p] == 1} {
     ad_returnredirect "one-community-type"
Index: openacs-4/packages/dotlrn/www/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/configure.adp	9 Nov 2001 04:03:02 -0000	1.2
+++ openacs-4/packages/dotlrn/www/configure.adp	21 Jan 2002 06:30:11 -0000	1.3
@@ -1,5 +1,7 @@
 <master src="master">
 <property name="title">Configure @name@</property>
-<p>
+<property name="portal_id">@portal_id@</property>
 
+<p></p>
+
 @rendered_page@
Index: openacs-4/packages/dotlrn/www/index-not-a-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/index-not-a-user.adp	11 Dec 2001 03:19:48 -0000	1.2
+++ openacs-4/packages/dotlrn/www/index-not-a-user.adp	21 Jan 2002 06:30:11 -0000	1.3
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">dotLRN - Not a User</property>
+<property name="portal_id">@portal_id@</property>
 
 <if @admin_p@>Visit <a href=@admin_url@>dotLRN Administration</a>.<p>
 
Index: openacs-4/packages/dotlrn/www/index-not-a-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/index-not-a-user.tcl	11 Dec 2001 06:25:15 -0000	1.1
+++ openacs-4/packages/dotlrn/www/index-not-a-user.tcl	21 Jan 2002 06:30:11 -0000	1.2
@@ -8,9 +8,11 @@
 } -properties {
     admin_p:onevalue
     admin_url:onevalue
+    portal_id:onevalue
 }
 
 set admin_p [dotlrn::admin_p]
 set admin_url [dotlrn::get_url]/admin
+set portal_id ""
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/index.adp	10 Jan 2002 19:30:18 -0000	1.12
+++ openacs-4/packages/dotlrn/www/index.adp	21 Jan 2002 06:30:11 -0000	1.13
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">dotLRN</property>
+<property name="portal_id">@portal_id@</property>
 
 [
   <font size="-1">
Index: openacs-4/packages/dotlrn/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/master.adp	17 Dec 2001 23:02:56 -0000	1.5
+++ openacs-4/packages/dotlrn/www/master.adp	21 Jan 2002 06:30:11 -0000	1.6
@@ -1,10 +1,50 @@
 <master>
 <property name="title">@title@</property>
+<property name="portal_id">@portal_id@</property>
 
-<h2>@title@</h2>
+<table width="100%" border="0" cellpadding="3" cellspacing="0" bgcolor="#FFFFFF">
+  <tr bgcolor="#CC0000">
+    <td colspan="3" valign="middle">
+      <img src="/dotlrn/spacer.gif" width="1" height="1">
+     </td>
+  </tr>
+  <tr>
+    <td width="12%" valign="middle" bgcolor="ffffff"> 
+      <a href="/dotlrn/">
+      <img src="/dotlrn/logowhite.gif" width="100" height="65" border="0" alt="dotlrn"></a>
+    </td>
+    <td width="57%" valign="middle" bgcolor="#FFFFFF">
+      <font face="arial,helvetica" size="+1" color="#000000">@text@</font> 
+    </td>
+    <td valign="middle" width="31%" bgcolor="#FFFFFF">
+      <div align="right">
+      <a href="/dotlrn/">
+      <img src="/dotlrn/myspace.gif" width="98" height="25" border="0" alt="my dotlrn" align="middle"></a>
+      <a href="/help">
+      <img src="/dotlrn/help.gif" width="67" height="25" border="0" alt="help" align="middle"></a>
+      <a href="/register/logout">
+      <img src="/dotlrn/logout.gif" width="62" height="25" border="0" alt="logout" align="middle"></a></div>
+    </td>
+  </tr>
+  <tr bgcolor="#CC0000">
+    <td colspan="3"  valign="middle">
+    <img src="/dotlrn/spacer.gif" width="1" height="1">
+    </td>
+  </tr>
+</table>
 
-<if @context_bar@ not nil>
-  <%= [eval dotlrn::navbar $context_bar] %>
-</if>
-<hr>
+<P>
+
+
+<small>@navbar@</small>
+<P>
+
 <slave>
+
+<small>@navbar@</small>
+<P>
+<P>
+<P>
+<hr>
+<hr>
+<small><a href="http://mitsloan.mit.edu">MIT Sloan School of Management</a> | <a href="http://web.mit.edu">MIT</a></small>
Index: openacs-4/packages/dotlrn/www/member-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/member-add-2.adp	20 Jan 2002 19:43:46 -0000	1.3
+++ openacs-4/packages/dotlrn/www/member-add-2.adp	21 Jan 2002 06:30:11 -0000	1.4
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">Add A Member To A Community</property>
+<property name="portal_id">@portal_id@</property>
 
 You're adding <strong>@first_names@ @last_name@ (@email@)</strong>:<p>
 
Index: openacs-4/packages/dotlrn/www/member-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/member-add-2.tcl	20 Jan 2002 19:17:39 -0000	1.2
+++ openacs-4/packages/dotlrn/www/member-add-2.tcl	21 Jan 2002 06:30:11 -0000	1.3
@@ -11,7 +11,7 @@
 } -properties {
     roles:multirow
 }
-
+set portal_id ""
 set community_id [dotlrn_community::get_community_id]
 
 dotlrn::require_user_admin_community $community_id
Index: openacs-4/packages/dotlrn/www/member-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/member-add.adp	20 Jan 2002 19:43:46 -0000	1.3
+++ openacs-4/packages/dotlrn/www/member-add.adp	21 Jan 2002 06:30:11 -0000	1.4
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="title">Add A Member To A Community</property>
 <property name="context_bar">@context_bar@</property>
+<property name="portal_id">@portal_id@</property>
 
 The results of your search are:
 <ul>
Index: openacs-4/packages/dotlrn/www/member-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/member-add.tcl	20 Jan 2002 19:17:39 -0000	1.2
+++ openacs-4/packages/dotlrn/www/member-add.tcl	21 Jan 2002 06:30:11 -0000	1.3
@@ -9,7 +9,7 @@
     search_text
     {referer "one-community-admin"}
 }
-
+set portal_id ""
 set community_id [dotlrn_community::get_community_id]
 
 # Just search
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/members.adp	20 Jan 2002 19:17:39 -0000	1.2
+++ openacs-4/packages/dotlrn/www/members.adp	21 Jan 2002 06:30:11 -0000	1.3
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">Manage Membership</property>
 <property name="context_bar">@context_bar@</property>
+<property name="portal_id">@portal_id@</property>
 
 <include src="members-chunk" referer="members">
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/members.tcl	20 Jan 2002 19:43:46 -0000	1.2
+++ openacs-4/packages/dotlrn/www/members.tcl	21 Jan 2002 06:30:11 -0000	1.3
@@ -7,6 +7,8 @@
 } -query {
 }
 
+set portal_id ""
+
 set context_bar {{"one-community-admin" Admin} {Manage Members}}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/not-allowed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/not-allowed.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/not-allowed.adp	20 Jan 2002 21:10:12 -0000	1.2
+++ openacs-4/packages/dotlrn/www/not-allowed.adp	21 Jan 2002 06:30:11 -0000	1.3
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">Not Allowed</property>
+<property name="portal_id"></property>
 
 <p>
   You are not allowed to perform that action.
Index: openacs-4/packages/dotlrn/www/one-community-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/one-community-admin.adp	20 Jan 2002 17:20:45 -0000	1.11
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp	21 Jan 2002 06:30:11 -0000	1.12
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="title">Admin: @pretty_name@</property>
 <property name="context_bar">@context_bar@</property>
+<property name="portal_id">@portal_id@</property>
 
 <ul>
 
Index: openacs-4/packages/dotlrn/www/one-community-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/one-community-admin.tcl	20 Jan 2002 06:11:04 -0000	1.11
+++ openacs-4/packages/dotlrn/www/one-community-admin.tcl	21 Jan 2002 06:30:11 -0000	1.12
@@ -17,6 +17,7 @@
     n_subgroups:onevalue
 }
 
+set portal_id ""
 set community_id [dotlrn_community::get_community_id]
 
 dotlrn::require_user_admin_community $community_id
Index: openacs-4/packages/dotlrn/www/one-community-not-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/one-community-not-member.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/one-community-not-member.adp	19 Jan 2002 17:26:07 -0000	1.6
+++ openacs-4/packages/dotlrn/www/one-community-not-member.adp	21 Jan 2002 06:30:11 -0000	1.7
@@ -1,6 +1,8 @@
+<!-- lost/dead file? aks ->
 <master src="master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@pretty_name@</property>
+<property name="portal_id">@portal_id@</property>
 
 [
   <font size="-1">
Index: openacs-4/packages/dotlrn/www/one-community-portal-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/one-community-portal-template.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/one-community-portal-template.adp	28 Nov 2001 20:45:05 -0000	1.1
+++ openacs-4/packages/dotlrn/www/one-community-portal-template.adp	21 Jan 2002 06:30:11 -0000	1.2
@@ -1,5 +1,7 @@
 <master src="master">
 <property name="title">Configure this instance's template</property>
-<p>
+<property name="portal_id">@portal_id@</property>
 
+<p></p>
+
 @rendered_page@
Index: openacs-4/packages/dotlrn/www/one-community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/one-community-type.adp	20 Jan 2002 22:25:42 -0000	1.16
+++ openacs-4/packages/dotlrn/www/one-community-type.adp	21 Jan 2002 06:30:11 -0000	1.17
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@title@</property>
+<property name="portal_id">@portal_id@</property>
 
 <p></p>
 
Index: openacs-4/packages/dotlrn/www/one-community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/one-community-type.tcl	15 Jan 2002 20:47:01 -0000	1.10
+++ openacs-4/packages/dotlrn/www/one-community-type.tcl	21 Jan 2002 06:30:11 -0000	1.11
@@ -17,6 +17,7 @@
     communities_title:onevalue
     title:onevalue
 }
+set portal_id ""
 
 # Check that this is a community type
 if {[ad_parameter community_type_level_p] != 1} {
Index: openacs-4/packages/dotlrn/www/one-community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/one-community.adp	19 Jan 2002 17:26:07 -0000	1.8
+++ openacs-4/packages/dotlrn/www/one-community.adp	21 Jan 2002 06:30:11 -0000	1.9
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@pretty_name@</property>
+<property name="portal_id">@portal_id@</property>
 
 [
   <font size="-1">
Index: openacs-4/packages/dotlrn/www/preferences.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/preferences.adp	19 Jan 2002 22:54:20 -0000	1.2
+++ openacs-4/packages/dotlrn/www/preferences.adp	21 Jan 2002 06:30:11 -0000	1.3
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">@title@</property>
+<property name="portal_id">@portal_id@</property>
 
 <ul>
   <li><a href="/pvt/home">Edit My Profile</a></li>
Index: openacs-4/packages/dotlrn/www/preferences.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/preferences.tcl	19 Jan 2002 22:54:20 -0000	1.3
+++ openacs-4/packages/dotlrn/www/preferences.tcl	21 Jan 2002 06:30:11 -0000	1.4
@@ -13,7 +13,7 @@
     admin_p:onevalue
     admin_url:onevalue
 }
-
+set portal_id ""
 # Make sure user is logged in
 set user_id [ad_maybe_redirect_for_registration]
 
Index: openacs-4/packages/dotlrn/www/student-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/student-list.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/student-list.adp	10 Jan 2002 19:30:18 -0000	1.3
+++ openacs-4/packages/dotlrn/www/student-list.adp	21 Jan 2002 06:30:11 -0000	1.4
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">@pretty_name@ - Student List</property>
+<property name="portal_id">@portal_id@</property>
 
 <ul>
 <multiple name="students">
Index: openacs-4/packages/dotlrn/www/student-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/student-list.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/student-list.tcl	20 Jan 2002 19:43:46 -0000	1.5
+++ openacs-4/packages/dotlrn/www/student-list.tcl	21 Jan 2002 06:30:11 -0000	1.6
@@ -6,6 +6,8 @@
 } -query {
 }
 
+set portal_id ""
+
 # Check that this is a community type
 if {[ad_parameter community_level_p] != 1} {
     ns_returnredirect "./"
Index: openacs-4/packages/dotlrn/www/user-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/user-add-2.adp	20 Jan 2002 21:10:12 -0000	1.1
+++ openacs-4/packages/dotlrn/www/user-add-2.adp	21 Jan 2002 06:30:11 -0000	1.2
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="title">Add A User</property>
 <property name="context_bar">@context_bar@</property>
+<property name="portal_id">@portal_id@</property>
 
 @first_names@ @last_name@ has been added to @system_name@.
 Edit the message below and hit "Send Email" to 
Index: openacs-4/packages/dotlrn/www/user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/user-add-2.tcl	20 Jan 2002 21:10:12 -0000	1.1
+++ openacs-4/packages/dotlrn/www/user-add-2.tcl	21 Jan 2002 06:30:12 -0000	1.2
@@ -23,6 +23,7 @@
     administration_name:onevalue
 }
 
+set portal_id ""
 set context_bar {{"one-community-admin" Admin} {Add User}}
 
 set admin_user_id [ad_verify_and_get_user_id]
Index: openacs-4/packages/dotlrn/www/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/user-add.adp	19 Jan 2002 22:54:20 -0000	1.1
+++ openacs-4/packages/dotlrn/www/user-add.adp	21 Jan 2002 06:30:12 -0000	1.2
@@ -1,5 +1,6 @@
 <master src="master">
 <property name="title">Add A User</property>
 <property name="context_bar">@context_bar@</property>
+<property name="portal_id">@portal_id@</property>
 
 <formtemplate id="add_user"></formtemplate>
Index: openacs-4/packages/dotlrn/www/user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/user-add.tcl	20 Jan 2002 21:10:12 -0000	1.3
+++ openacs-4/packages/dotlrn/www/user-add.tcl	21 Jan 2002 06:30:12 -0000	1.4
@@ -15,6 +15,8 @@
     context_bar:onevalue
 }
 
+set portal_id ""
+
 set user_id [ad_maybe_redirect_for_registration]
 
 if {![dotlrn::admin_p -user_id $user_id]} {
Index: openacs-4/packages/new-portal/sql/oracle/api-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/api-create.sql,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/new-portal/sql/oracle/api-create.sql	28 Nov 2001 23:31:24 -0000	1.26
+++ openacs-4/packages/new-portal/sql/oracle/api-create.sql	21 Jan 2002 06:29:55 -0000	1.27
@@ -13,8 +13,8 @@
 	function new (
 		portal_id		in portals.portal_id%TYPE default null,
 		name			in portals.name%TYPE default 'Untitled',
-		layout_id		in portals.layout_id%TYPE default null,
 		theme_id		in portals.theme_id%TYPE default null,
+		layout_id		in portal_layouts.layout_id%TYPE default null,
 		portal_template_p	in portals.portal_template_p%TYPE default 'f',
 		template_id		in portals.template_id%TYPE default null,
 		object_type		in acs_object_types.object_type%TYPE default 'portal',
@@ -38,8 +38,8 @@
 	function new (
 		portal_id		in portals.portal_id%TYPE default null,
 		name			in portals.name%TYPE default 'Untitled',
-		layout_id		in portals.layout_id%TYPE default null,
 		theme_id		in portals.theme_id%TYPE default null,
+		layout_id		in portal_layouts.layout_id%TYPE default null,
 		portal_template_p	in portals.portal_template_p%TYPE default 'f',
 		template_id		in portals.template_id%TYPE default null,
 		object_type		in acs_object_types.object_type%TYPE default 'portal',
@@ -54,7 +54,11 @@
 		v_portal_id portals.portal_id%TYPE;
 		v_theme_id portals.theme_id%TYPE;
 		v_layout_id portal_layouts.layout_id%TYPE;
+		v_page_id portal_pages.page_id%TYPE;
+		v_current_page_id portal_pages.page_id%TYPE;
 	begin
+
+                -- we must create at least one page for this portal
 		v_portal_id := acs_object.new (
 			object_id	=> portal_id,
 			object_type	=> object_type,
@@ -64,25 +68,67 @@
 			context_id	=> context_id
 		);
 
-		if template_id is null then	       
-		   select max(theme_id) into v_theme_id from portal_element_themes;
-		   select min(layout_id) into v_layout_id from portal_layouts;
+                if template_id is null then	       
+                   select max(theme_id) into v_theme_id from portal_element_themes;
 
-		   insert into portals 
-			  (portal_id, name, layout_id, theme_id, portal_template_p)
-		   values (v_portal_id, name, v_layout_id, v_theme_id, portal_template_p);
+                   if layout_id is null then
+                     select min(layout_id) into v_layout_id from portal_layouts;
+                   else 
+                     v_layout_id := portal.new.layout_id;
+                   end if;
 
-		else
-		-- we have to copy things like the template, theme form the template
-		-- portal_template_p is false. no chained templates yet
-		select theme_id, layout_id into v_theme_id, v_layout_id 
-		from portals where portal_id = portal.new.template_id;
+                   insert into portals 
+                          (portal_id, name, theme_id, portal_template_p)
+                   values (v_portal_id, name, v_theme_id, portal_template_p);
 
-		   insert into portals 
-			  (portal_id, name, layout_id, theme_id, portal_template_p, template_id)
-		   values (v_portal_id, name, v_layout_id, v_theme_id, 'f', portal.new.template_id);
-		end if;
+                   -- now insert the default page
+		   v_page_id := portal_page.new (
+			portal_id	=> v_portal_id,
+			pretty_name     => 'Default Page',      
+                        layout_id       => v_layout_id,
+			creation_date	=> creation_date,
+			creation_user	=> creation_user,
+			creation_ip	=> creation_ip,
+			context_id	=> context_id
+		   );
 
+                   -- set the current page to the page we just made
+--                   insert into portal_current_page
+--                   (portal_id, page_id) values (v_portal_id, v_page_id);
+
+                else
+                   -- we have to copy things like the template, theme form the template
+                   -- portal_template_p is false. no chained templates yet
+                   select theme_id into v_theme_id 
+                   from portals 
+                   where portal_id = portal.new.template_id;
+
+                   insert into portals 
+                   (portal_id, name, theme_id, portal_template_p, template_id)
+                   values 
+                   (v_portal_id, name,  v_theme_id, 'f', portal.new.template_id);
+
+                   for page in (select * from portal_pages where portal_id = portal.new.template_id) loop
+                       -- now insert the pages from the portal template
+		       v_page_id := portal_page.new (
+		            portal_id       => v_portal_id,
+		            pretty_name     => page.pretty_name,      
+                            layout_id       => page.layout_id,
+                            sort_key        => page.sort_key
+		       );                                      
+                   end loop;
+
+                    -- set the current page to page with sk 0
+                    select page_id into v_current_page_id 
+                    from portal_pages 
+                    where portal_id = v_portal_id
+                    and sort_key = 0; 
+                    
+                    insert into portal_current_page
+                    (portal_id, page_id) values (v_portal_id, v_current_page_id);
+                end if;
+
+
 		return v_portal_id;
 	end new;
 
@@ -91,14 +137,115 @@
 	)
 	is
 	begin
+                  for page in (select page_id
+                               from portal_pages 
+                               where portal_id = portal.delete.portal_id) 
+                  loop
+
+                       -- delete this portal's pages
+		       portal_page.delete (
+		            page_id       => page.page_id
+                       );                                      
+                   end loop;
+
 		acs_object.delete(portal_id);
 	end delete;
 
 end portal;
 /
 show errors
 
+create or replace package portal_page
+as
+	function new (
+		page_id                 in portal_pages.page_id%TYPE default null,
+		pretty_name		in portal_pages.pretty_name%TYPE default 'Untitled Page',
+		portal_id		in portal_pages.portal_id%TYPE default null,
+		layout_id		in portal_pages.layout_id%TYPE default null,
+		sort_key		in portal_pages.sort_key%TYPE default 0,
+		object_type		in acs_object_types.object_type%TYPE default 'portal_page',
+		creation_date		in acs_objects.creation_date%TYPE 
+					default sysdate,
+		creation_user		in acs_objects.creation_user%TYPE 
+					default null,
+		creation_ip		in acs_objects.creation_ip%TYPE default null, 
+		context_id		in acs_objects.context_id%TYPE default null 
+	) return portal_pages.page_id%TYPE;
 
+	procedure delete (
+		page_id                 in portal_pages.page_id%TYPE
+	);
+end portal_page;
+/
+show errors
+
+create or replace package body portal_page
+as
+	function new (
+		page_id                 in portal_pages.page_id%TYPE default null,
+		pretty_name		in portal_pages.pretty_name%TYPE default 'Untitled Page',
+		portal_id		in portal_pages.portal_id%TYPE default null,
+		layout_id		in portal_pages.layout_id%TYPE default null,
+		sort_key		in portal_pages.sort_key%TYPE default 0,
+		object_type		in acs_object_types.object_type%TYPE default 'portal_page',
+		creation_date		in acs_objects.creation_date%TYPE 
+					default sysdate,
+		creation_user		in acs_objects.creation_user%TYPE 
+					default null,
+		creation_ip		in acs_objects.creation_ip%TYPE default null, 
+		context_id		in acs_objects.context_id%TYPE default null 
+	) return portal_pages.page_id%TYPE
+	is
+		v_page_id portal_pages.page_id%TYPE;
+		v_layout_id portal_pages.layout_id%TYPE;
+		v_sort_key portal_pages.sort_key%TYPE;
+	begin
+		v_page_id := acs_object.new (
+			object_type	=> object_type,
+			creation_date	=> creation_date,
+			creation_user	=> creation_user,
+			creation_ip	=> creation_ip,
+			context_id	=> context_id
+		);
+
+                if layout_id is null then             
+                   select min(layout_id) into v_layout_id from portal_layouts;
+                else 
+                   v_layout_id := layout_id;
+                end if;
+
+                if portal_id is not null then             
+                   select max(sort_key) + 1  into v_sort_key 
+                   from portal_pages 
+                   where portal_id = portal_page.new.portal_id;                   
+                   if v_sort_key is null then
+                      v_sort_key := 0;
+                   end if;
+                else 
+                    raise_application_error(-20000, 'NULL portal_id sent to portal_page.new!');
+                end if;
+
+		insert into portal_pages 
+                       (page_id, pretty_name, portal_id, layout_id, sort_key)
+		values (v_page_id, pretty_name, portal_id, v_layout_id, v_sort_key);
+
+                return v_page_id;
+	end new;
+
+	procedure delete (
+		page_id         in portal_pages.page_id%TYPE
+	)
+	is
+	begin
+                delete from portal_current_page where page_id = page_id;
+                acs_object.delete(page_id);
+	end delete;
+
+end portal_page;
+/
+show errors
+
+
 -- Portal element themes
 create or replace package portal_element_theme
 as
Index: openacs-4/packages/new-portal/sql/oracle/defaults.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/defaults.sql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/new-portal/sql/oracle/defaults.sql	19 Jan 2002 21:59:47 -0000	1.15
+++ openacs-4/packages/new-portal/sql/oracle/defaults.sql	21 Jan 2002 06:29:55 -0000	1.16
@@ -17,16 +17,7 @@
 	theme_id	portal_element_themes.theme_id%TYPE;
 begin
 
--- two-column layout, without a header.
-	layout_id := portal_layout.new (
-		name => 'Simple 1-Column',
-		description => 'A simple 1-column layout',
-		filename => 'layouts/simple1',
-		resource_dir => 'layouts/components/simple1');
 
--- the supported regions for that layout.
-	portal_layout.add_region (layout_id => layout_id, region => '1');
-
 -- two-column layout, without a header.
 	layout_id := portal_layout.new (
 		name => 'Simple 2-Column',
@@ -38,6 +29,16 @@
 	portal_layout.add_region (layout_id => layout_id, region => '1');
 	portal_layout.add_region (layout_id => layout_id, region => '2');
 
+-- one-column layout, without a header.
+	layout_id := portal_layout.new (
+		name => 'Simple 1-Column',
+		description => 'A simple 1-column layout',
+		filename => 'layouts/simple1',
+		resource_dir => 'layouts/components/simple1');
+
+-- the supported regions for that layout.
+	portal_layout.add_region (layout_id => layout_id, region => '1');
+
 -- same as above, only, three columns.
 	layout_id := portal_layout.new (
 		name => 'Simple 3-Column',
Index: openacs-4/packages/new-portal/sql/oracle/objects-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/objects-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/sql/oracle/objects-create.sql	28 Sep 2001 15:40:55 -0000	1.3
+++ openacs-4/packages/new-portal/sql/oracle/objects-create.sql	21 Jan 2002 06:29:55 -0000	1.4
@@ -206,3 +206,19 @@
 end; 
 / 
 show errors;
+
+
+-- portal_page
+begin  
+  acs_object_type.create_type ( 
+    supertype     => 'acs_object', 
+    object_type   => 'portal_page', 
+    pretty_name   => 'Portal Page', 
+    pretty_plural => 'Portal Pages', 
+    table_name    => 'PORTAL_PAGES', 
+    id_column     => 'page_id',
+    package_name  => 'portal_page'
+  ); 
+end;
+/
+show errors;
Index: openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql	14 Dec 2001 03:24:26 -0000	1.33
+++ openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql	21 Jan 2002 06:29:55 -0000	1.34
@@ -135,9 +135,6 @@
 				constraint p_portal_id_pk
 				primary key,
 	name			varchar(200) default 'Untitled' not null,
-	layout_id		constraint portal_layout_id_fk
-				references portal_layouts
-				not null,
 	theme_id		constraint portal_theme_id_fk
 				references portal_element_themes
 				not null,
@@ -150,6 +147,39 @@
 				references portals
 );
 
+-- **** (Portal) Pages ****
+-- Support for multi-page portals (think my.yahoo.com)
+create table portal_pages (
+	page_id                 constraint portal_pages_page_id_fk
+				references acs_objects(object_id)
+				constraint portal_pages_page_id_pk
+				primary key,
+	pretty_name		varchar(200) default 'Untitled Page' not null,
+	portal_id		constraint portal_pages_portal_id_fk
+				references portals
+                                not null,
+	layout_id		constraint portal_pages_layout_id_fk
+				references portal_layouts
+				not null,
+	sort_key		integer	not null,
+ 	-- Two pages on one portal canot have the same sort key
+	constraint portal_pages_srt_key_un 
+	unique(portal_id,sort_key)
+);
+
+-- what's the current page for this portal?
+create table portal_current_page (
+	portal_id		constraint portal_cur_page_portal_id_fk
+				references portals
+                                on delete cascade
+                                not null,
+	page_id                 constraint portal_cur_page_id_fk
+				references portal_pages
+                                not null,
+	constraint portal_curr_page_un
+	unique(portal_id,page_id)
+);
+
 -- **** Portal Elements (PEs) ****
 
 
@@ -173,8 +203,9 @@
 				primary key,
 	name			varchar(200) not null,
 	pretty_name		varchar(200) not null,
-	portal_id		constraint p_element_map_portal_id_fk
-				references portals on delete cascade
+	page_id                 constraint p_element_map_page_id_fk
+				references portal_pages
+                                on delete cascade
 				not null,
 	datasource_id		constraint p_element_map_datasource_id_fk
 				references portal_datasources
@@ -188,10 +219,10 @@
 					        'pinned')),
  	-- Two elements may not exist in the same place on a portal.
 	constraint p_element_map_pid_rgn_srt_un 
-	unique(portal_id,region,sort_key),
+	unique(page_id,region,sort_key),
  	-- Two elements may not have the same pretty name on a portal.
 	constraint p_element_map_pid_name_un 
-	unique(portal_id,pretty_name)
+	unique(page_id,pretty_name)
 );
 
 create table portal_element_parameters (
Index: openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql	10 Dec 2001 20:26:08 -0000	1.1
+++ openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql	21 Jan 2002 06:29:55 -0000	1.2
@@ -53,9 +53,10 @@
   <querytext>
     update portal_element_map
     set region = :region,
-    sort_key = (select nvl((select max(sort_key) + 1
-	                    from portal_element_map 
-	                    where portal_id = :portal_id 
+    sort_key = (select nvl((select max(pem.sort_key) + 1
+	                    from portal_element_map pem, portal_pages pp
+	                    where pp.portal_id = :portal_id 
+                            and pp.page_id = pem.page_id
 		            and region = :region), 
                             1) 
 		 from dual)
@@ -66,11 +67,11 @@
 <fullquery name="portal::add_element_to_region.insert">      
   <querytext>
     insert into portal_element_map
-    (element_id, name, pretty_name, portal_id, datasource_id, region, sort_key)
+    (element_id, name, pretty_name, page_id, datasource_id, region, sort_key)
     values
-    (:new_element_id, :ds_name, :ds_name, :portal_id, :ds_id, :region,  
+    (:new_element_id, :ds_name, :ds_name, :page_id, :ds_id, :region,  
     nvl((select max(sort_key) + 1 
-         from portal_element_map 
+         from portal_element_map
          where region = :region), 1))
   </querytext>
 </fullquery> 
@@ -79,22 +80,38 @@
   <querytext>
     update portal_element_map 
     set region = :target_region, 
-    sort_key = (select nvl((select max(sort_key) + 1
-	                    from portal_element_map 
-	                    where portal_id = :portal_id 
-	                    and region = :target_region), 
+    sort_key = (select nvl((select max(pem.sort_key) + 1
+	                    from portal_element_map pem, portal_pages pp
+	                    where pp.portal_id = :portal_id
+                            and pp.page_id = pem.page_id
+                            and region = :target_region), 
                            1) 
                 from dual)
     where element_id = :element_id
   </querytext>
 </fullquery> 		
 
+<fullquery name="portal::page_create.page_create_insert">
+<querytext>
 
+    begin
+    
+    :1 := portal_page.new ( 
+    pretty_name => :pretty_name,
+    portal_id => :portal_id,
+    layout_id => :layout_id,
+    );
 
+    end;
 
+</querytext>
+</fullquery>
 
 
 
 
+
+
+
 </queryset>
 
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.91 -r1.92
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	19 Jan 2002 21:59:47 -0000	1.91
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	21 Jan 2002 06:29:55 -0000	1.92
@@ -106,8 +106,7 @@
 	@param user_id
 	@param layout_name optional
     } {
-	# XXX todo permissions should be portal_create_portal	
-	db_1row layout_id_select {}
+	db_1row min_layout_id_select {}
 	return [ db_exec_plsql create_new_portal_and_perms {}]
     }
     
@@ -142,11 +141,12 @@
     }
     
     ad_proc -public render { 
+        {-page_num 0}
         {-hide_links_p "f"} 
+        {-hide_links_p "f"} 
         {-render_style "individual"}
         portal_id
         {theme_id ""} 
-
     } {
 	Get a portal by id. If it's not found, say so.
 	FIXME: right now the render style is totally ignored (ben)
@@ -164,7 +164,7 @@
 	# get the portal and layout
 	db_1row portal_select {} -column_array portal
 
-	# theme_id override
+	# theme_id override  
 	if { $theme_id != "" } { set portal(theme_id) $theme_id }
 
 	db_foreach element_select {} -column_array entry {
@@ -216,8 +216,6 @@
 	and $var_stub_i1- $var_stub_i8, each contining the portal_ids that
 	belong in that region. - Ian Baker
 
-	AKS: XXX improve me
-	
 	@param element_id_list An [array get]'d array, keys are regions, \
 		values are lists of element_ids.
 	@param var_stub A name upon which to graft the bits that will be \
@@ -257,13 +255,16 @@
     
 
     ad_proc -public configure { 
+        {-page_num 0}
         {-template_p "f"}
         portal_id
         return_url
     } {
 	Return a portal or portal template configuration page. 
 	All form targets point to file_stub-2.
     
+	@param page_num the page of the portal to config, def 0
+	@param template_p is this portal a template?
 	@param portal_id
 	@return_url
 	@return A portal configuration page	
@@ -305,8 +306,10 @@
         # get the portal.	    
         db_1row portal_select {} -column_array portal
 
+        # XXXX page support 
+
         # fake some elements for the <list> in the template 
-        set layout_id [get_layout_id $portal_id]
+        set layout_id [get_layout_id -page_num $page_num $portal_id]
 
         db_foreach get_regions {}  {
             lappend fake_element_ids($region) $portal_id
@@ -329,13 +332,13 @@
         <form method=post action=@action_string@>
         <input type=hidden name=portal_id value=@portal_id@>
         <input type=hidden name=return_url value=@return_url@>
-        <b>Change Theme:</b>
+        <b>Change Theme:</b> 
         @theme_data@
         </form>
         <P>
         <b>Configure The Portal's Elements:</b>
         <include src=\"@portal.template@\" element_list=\"@element_list@\" 
-        action_string=@action_string@ portal_id=@portal_id@ 
+        action_string=@action_string@ portal_id=@portal_id@
         return_url=\"@return_url@\" element_src=\"@element_src@\"
         hide_links_p=f>
         "
@@ -508,11 +511,135 @@
         configure_dispatch -template_p "t" $portal_id $form 
     }
     
+    
     #
+    # Page Procs
+    #
+
+    ad_proc -public get_page_id {
+        {-portal_id:required}
+        {-sort_key "0"}
+        {-current "f"}
+    } {
+        Gets the id of the page with the given portal_id and sort_key
+        if no sort_key is given returns the first page of the portal
+        which is always there. 
+
+	@return the id of the page
+	@param portal_id 
+	@param current boolean get the current page if true
+	@param sort_key - optional, defaults to page 0
+    } {
+
+        if {$current == "f"} {
+            set foo  [db_string get_page_id_select {}]
+        } else {
+            set foo [db_string get_current_page_id_select {}]
+        }
+
+        ns_log notice "aks6 foo is $foo"
+        return $foo
+    }
+
+    ad_proc -public page_count {
+        {-portal_id:required}
+    } {
+	1 when there's only one page
+
+	@param portal_id 
+	@param page_id 
+    } {
+        return [db_1row page_count_select {}]
+    }
+
+    ad_proc -public set_current_page {
+        {-portal_id:required}
+        {-page_id:required}
+    } {
+        Sets the current page id 
+
+	@param portal_id 
+	@param page_id 
+    } {
+        db_dml set_current_page_update {}]
+    }
+
+
+    ad_proc -public get_page_pretty_name {
+        {-page_id:required}
+    } {
+        Gets the pn
+    } {
+        return [db_string get_page_pretty_name_select {}]
+    }
+
+    ad_proc -public page_create {
+        {-pretty_name:required}
+        {-portal_id:required}
+        {-layout_id:required}
+    } {
+        Appends a new blank page for the given portal_id. 
+
+	@return the id of the page
+	@param portal_id 
+    } {
+        return [db_string page_create_insert {}]
+    }
+
+    ad_proc -public list_pages_tcl_list {
+        {-portal_id:required}
+    } {
+        Returns a tcl list of the page_ids for the given portal_id
+
+	@return tcl list of the pages
+	@param portal_id 
+    } {
+        set foo [list]
+       
+        db_foreach list_pages_tcl_list_select {} {
+            lappend foo $page_id
+        } 
+        return $foo
+    }
+
+    ad_proc -public list_pages {
+        {-portal_id:required}
+        {-link ""}
+        {-pre_html ""}
+        {-post_html ""}
+        {-separator "&nbsp;"}
+    } {
+        Returns an html string of the pretty names of the pages in the 
+        given portal. 
+
+	@return the id of the page
+	@param portal_id 
+	@param link the relative link to set for hrefs
+        @param current_page_link f means that there is no link for the current page
+    } {
+        set html $pre_html
+        set current_page_id [get_page_id -current "t" -portal_id $portal_id]
+
+        foreach page [list_pages_tcl_list -portal_id $portal_id] {
+            if {$page == $current_page_id} {
+                append html "[get_page_pretty_name -page_id $page]"
+            } else {
+                append html "<a href=$link?page_id=$page>[get_page_pretty_name -page_id $page]</a>"
+            }
+            append html $separator
+        }
+        
+        return [append html $post_html]
+        
+    }
+
+    #
     # Element Procs
     #
 
     ad_proc -public add_element { 
+        {-page_id ""}
+        {-page_num ""}
         portal_id
         ds_name
     } {
@@ -521,14 +648,23 @@
 	
 	@return the id of the new element
 	@param portal_id 
+	@param page_num the number of the portal page to add to, def 0 
 	@param ds_name
     } {
+        if { [empty_string_p $page_num] && [empty_string_p $page_id] } {
+            # neither page_num or page_id given, default to 0
+            set page_id [portal::get_page_id -portal_id $portal_id -sort_key 0]
+        } 
+
 	# Balance the portal by adding the new element to the region
 	# with the fewest number of elements, the first region w/ 0 elts,
 	# or, if all else fails, the first region
 	set min_num 99999
 	set min_region 0
-	set layout_id [get_layout_id $portal_id]
+
+        # get the layout for some page?
+        ns_log notice "aks36  add_element args  $page_num/$page_id"
+        set layout_id [get_layout_id -page_id $page_id $portal_id]
 	
 	db_foreach get_regions {} {
 	    lappend region_list $region
@@ -548,8 +684,16 @@
 	    } 
 	}
 	
-	if { $min_region == 0 } { set min_region 1 }
-	return [add_element_to_region $portal_id $ds_name $min_region]
+	if { $min_region == 0 } { 
+            set min_region 1
+        }
+
+
+
+        return [add_element_to_region \
+                    -page_id $page_id \
+                    -layout_id $layout_id \
+                    $portal_id $ds_name $min_region]
     }
 
 
@@ -562,6 +706,8 @@
     }
 
     ad_proc -private add_element_to_region { 
+        {-layout_id:required}
+        {-page_id ""}
         portal_id
         ds_name
         region
@@ -573,16 +719,17 @@
 	@param ds_name
     } {
 
-	set ds_id [get_datasource_id $ds_name]
+	set ds_id [get_datasource_id $ds_name]        
 
-	# First, check if this portal has a portal template and
-	# that that template has an element of this DS in it. If 
+	# First, check if this portal 1) has a portal template and
+	# 2) that that template has an element of this DS in it. If 
 	# so, copy stuff. If not, just insert normally. 
 
 	if { [db_0or1row check_new {}] == 1 } {
 
             db_transaction {
                 set new_element_id [db_nextval acs_object_id_seq]
+                db_dml template_page_insert {}
                 db_dml template_insert {}
                 db_dml template_params_insert {}
             }
@@ -1040,13 +1187,22 @@
 	return [db_list select {}]
     }
     
-    ad_proc -private get_layout_id { portal_id } {
-	Get the layout_id of a layout template for a portal.
+    ad_proc -private get_layout_id { 
+        {-page_num ""}
+        {-page_id ""}
+        portal_id
+    } {
+	Get the layout_id of a layout template for a portal page.
 	
+	@param page_num the page of the portal to look at, def page 0
 	@param portal_id The portal_id.
 	@return A layout_id.
     } {
-	db_1row select {}
+        if { ![empty_string_p $page_num] } {
+            db_1row get_layout_id_num_select {}
+        } else {
+            db_1row get_layout_id_page_select {}
+        }
 	return $layout_id
     }    
     
@@ -1158,8 +1314,6 @@
 	db_transaction {
 	    foreach element_id $element_ids {
 
-                ns_log notice "aks30 $element_id, $key, $value_id"
-
 		remove_element_param_value -element_id $element_id \
                         -key $key \
                         -value $value_id
@@ -1169,9 +1323,6 @@
 
                     for {set x 0} {$x < [llength $extra_params]} {incr x 2} {
 
-                        ns_log notice "aks31 $element_id, [lindex $extra_params $x] 
-                                 [lindex $extra_params [expr $x + 1]]"
-
                         remove_element_param_value -element_id $element_id \
                                 -key [lindex $extra_params $x] \
                                 -value [lindex $extra_params [expr $x + 1]]
Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	19 Jan 2002 21:59:48 -0000	1.4
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	21 Jan 2002 06:29:55 -0000	1.5
@@ -19,11 +19,10 @@
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::create.layout_id_select">      
+<fullquery name="portal::create.min_layout_id_select">      
   <querytext>
-    select layout_id from
-    portal_layouts where
-    name = $layout_name 
+    select min(layout_id) as layout_id from
+    portal_layouts 
   </querytext>
 </fullquery> 
 
@@ -41,18 +40,21 @@
 
 <fullquery name="portal::render.portal_select">      
   <querytext>
-    select portal_id, portals.name, theme_id, filename as layout_template
-    from portals, portal_layouts
-    where portals.layout_id = portal_layouts.layout_id 
-    and portal_id = :portal_id
+    select  p.name, p.portal_id, p.theme_id, pl.filename as layout_template
+    from portals p, portal_pages pp, portal_layouts pl
+    where :portal_id = pp.portal_id 
+    and pp.portal_id = p.portal_id
+    and pp.layout_id = pl.layout_id
+    and pp.sort_key = :page_num
   </querytext>
 </fullquery> 
 
 <fullquery name="portal::render.element_select">      
   <querytext>
-    select element_id, region, sort_key
-    from portal_element_map
-    where portal_id = :portal_id
+    select element_id, region, pem.sort_key
+    from portal_element_map pem, portal_pages pp
+    where pp.portal_id = :portal_id
+    and pp.page_id = pem.page_id
     and state != 'hidden'
     order by region, sort_key
   </querytext>
@@ -84,10 +86,12 @@
 
 <fullquery name="portal::configure.portal_select">      
   <querytext>
-    select p.portal_id, p.name, t.filename as template, t.layout_id
-    from portals p, portal_layouts t
-    where p.layout_id = t.layout_id 
-    and p.portal_id = :portal_id
+    select  p.name, p.portal_id, pp.layout_id, pl.filename as template, sort_key as page_num
+    from portals p, portal_pages pp, portal_layouts pl
+    where :portal_id = pp.portal_id
+    and pp.portal_id = p.portal_id 
+    and pp.layout_id = pl.layout_id
+    and pp.sort_key = :page_num
   </querytext>
 </fullquery> 
 
@@ -168,6 +172,56 @@
   </querytext>
 </fullquery> 
 
+<fullquery name="portal::get_page_id.get_page_id_select">      
+  <querytext>
+   select page_id
+   from portal_pages
+   where portal_id = :portal_id 
+   and sort_key = :sort_key
+  </querytext>
+</fullquery> 
+
+<fullquery name="portal::page_count.page_count_select">      
+  <querytext>
+   select count(*)
+   from portal_pages
+   where portal_id = :portal_id 
+  </querytext>
+</fullquery> 
+
+<fullquery name="portal::set_current_page.set_current_page_update">      
+  <querytext>
+   update portal_current_page
+   set page_id = :page_id
+   where portal_id = :portal_id 
+  </querytext>
+</fullquery> 
+
+<fullquery name="portal::get_page_id.get_current_page_id_select">      
+  <querytext>
+   select page_id
+   from portal_current_page
+   where portal_id = :portal_id 
+  </querytext>
+</fullquery> 
+
+<fullquery name="portal::get_page_pretty_name.get_page_pretty_name_select">      
+  <querytext>
+   select pretty_name
+   from portal_pages
+   where page_id = :page_id 
+  </querytext>
+</fullquery> 
+
+<fullquery name="portal::list_pages_tcl_list.list_pages_tcl_list_select">      
+  <querytext>
+   select page_id
+   from portal_pages
+   where portal_id = :portal_id 
+   order by sort_key
+  </querytext>
+</fullquery> 
+
 <fullquery name="portal::add_element.get_regions">      
   <querytext>
     select region
@@ -179,9 +233,10 @@
 <fullquery name="portal::add_element.region_count">      
   <querytext>
     select count(*) as count
-    from portal_element_map
-    where portal_id = :portal_id
-    and region = :region
+    from portal_element_map pem, portal_pages pp
+    where pp.portal_id = :portal_id
+    and pem.region = :region
+    and pp.page_id = pem.page_id
   </querytext>
 </fullquery> 
 
@@ -194,22 +249,36 @@
 
 <fullquery name="portal::add_element_to_region.check_new">      
   <querytext>
-     select template_id
-     from portals p, portal_element_map pem
+     select 1 
+     from portals p, portal_element_map pem, portal_pages pp
      where p.portal_id = :portal_id
-     and p.template_id = pem.portal_id
+     and p.template_id = pp.portal_id
+     and pp.portal_id = pem.page_id
      and pem.datasource_id = :ds_id
   </querytext>
 </fullquery> 
 
+<fullquery name="portal::add_element_to_region.template_page_insert">      
+  <querytext>
+    insert into portal_pages
+    (element_id, name, pretty_name, page_id, datasource_id, region,  sort_key, state)
+    select :new_element_id, name, pretty_name, :page_id, :ds_id, region, sort_key, state
+    from portals p, portal_element_map pem, portal_pages pp
+    where pem.page_id = pp.page_id
+    and pp.portal_id = :template_id
+    and pem.datasource_id = :ds_id
+  </querytext>
+</fullquery> 
+
 <fullquery name="portal::add_element_to_region.template_insert">      
   <querytext>
     insert into portal_element_map
-    (element_id, name, pretty_name, portal_id, datasource_id, region,  sort_key, state)
-    select :new_element_id, name, pretty_name, :portal_id, :ds_id, region, sort_key, state
-    from portal_element_map
-    where portal_id = :template_id
-    and datasource_id= :ds_id
+    (element_id, name, pretty_name, page_id, datasource_id, region,  sort_key, state)
+    select :new_element_id, name, pretty_name, :page_id, :ds_id, region, sort_key, state
+    from portals p, portal_element_map pem, portal_pages pp
+    where pem.page_id = pp.page_id
+    and pp.portal_id = :template_id
+    and pem.datasource_id = :ds_id
   </querytext>
 </fullquery> 
 
@@ -220,9 +289,10 @@
     select acs_object_id_seq.nextval, :new_element_id, config_required_p, configured_p, key, value
     from portal_element_parameters
     where element_id = (select element_id
-                        from portal_element_map
-                        where portal_id = :template_id
-                        and datasource_id = :ds_id)
+                        from portal_element_map pem, portal_pages pp
+                        where pem.page_id = pp.page_id 
+                        and pp.portal_id = :template_id
+                        and pem.datasource_id = :ds_id)
 </querytext>
 </fullquery> 
 
@@ -381,8 +451,9 @@
 <fullquery name="portal::configure_element.select">      
   <querytext>
     select portal_id, datasource_id
-    from portal_element_map 
+    from portal_element_map pem, portal_pages pp
     where element_id = :element_id
+    and pem.page_id = pp.page_id
   </querytext>
 </fullquery> 
 
@@ -434,18 +505,25 @@
 
 <fullquery name="portal::get_element_ids_by_ds.select">      
   <querytext>
-    select element_id from portal_element_map
-    where portal_id= :portal_id 
+    select element_id from portal_element_map pem, portal_pages pp
+    where pp.portal_id= :portal_id 
     and datasource_id= :ds_id
+    and pem.page_id = pp.page_id
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::get_layout_id.select">      
+<fullquery name="portal::get_layout_id.get_layout_id_num_select">      
   <querytext>
-    select layout_id from portals where portal_id = :portal_id
+    select layout_id from portal_pages where portal_id = :portal_id and sort_key = :page_num
   </querytext>
 </fullquery> 
 
+<fullquery name="portal::get_layout_id.get_layout_id_page_select">      
+  <querytext>
+    select layout_id from portal_pages where page_id = :page_id
+  </querytext>
+</fullquery> 
+
 <fullquery name="portal::exists_p.select">      
   <querytext>
     select 1 from portals where portal_id = :portal_id
Index: openacs-4/packages/new-portal/www/place-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/new-portal/www/place-element.tcl	18 Dec 2001 21:28:25 -0000	1.22
+++ openacs-4/packages/new-portal/www/place-element.tcl	21 Jan 2002 06:29:55 -0000	1.23
@@ -12,7 +12,7 @@
     element_multi:multirow
 }
 
-set layout_id [portal::get_layout_id $portal_id]
+set layout_id [portal::get_layout_id -page_num 0 $portal_id]
 
 db_1row select_num_regions "
 select count(*) as num_regions
@@ -24,10 +24,11 @@
 template::multirow create element_multi element_id name sort_key state hideable_p
 
 db_foreach select_elements_by_region {
-    select element_id, pretty_name as name,  sort_key, state
-     from portal_element_map pem
+    select element_id, pem.pretty_name as name,  pem.sort_key, state
+     from portal_element_map pem, portal_pages pp
      where
-       portal_id = :portal_id 
+       pp.portal_id = :portal_id 
+       and pem.page_id = pp.page_id
        and region = :region 
        and state != 'hidden'
     order by sort_key } {
@@ -42,9 +43,10 @@
 
 db_1row select_all_noimm_count \
 "select count(*) as all_count
-from portal_element_map
+from portal_element_map pem, portal_pages pp
 where
-portal_id = :portal_id
+pp.portal_id = :portal_id
+and pem.page_id = pp.page_id
 and state != 'hidden'
 and region not like 'i%'"
 
@@ -58,9 +60,10 @@
 
 db_foreach hidden_elements {
     select element_id, name
-     from portal_element_map pem
+     from portal_element_map pem, portal_pages pp
      where
-       pem.portal_id = :portal_id 
+       pp.portal_id = :portal_id 
+       and pp.page_id = pem.page_id
        and pem.state = 'hidden'
     order by name
 } {
Index: openacs-4/packages/new-portal/www/template-place-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/template-place-element.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/template-place-element.tcl	26 Nov 2001 20:26:46 -0000	1.3
+++ openacs-4/packages/new-portal/www/template-place-element.tcl	21 Jan 2002 06:29:55 -0000	1.4
@@ -11,7 +11,7 @@
     return_url:onevalue
 }
 
-set layout_id [portal::get_layout_id $portal_id]
+set layout_id [portal::get_layout_id -page_num 0 $portal_id]
 
 db_1row select_num_regions "
 select count(*) as num_regions
@@ -22,10 +22,11 @@
 set region_count 0
 template::multirow create element_multi element_id name sort_key state hideable_p shadeable_p description
 db_foreach select_elements_by_region {
-    select pem.element_id, pem.name, sort_key, state, pd.description
-     from portal_element_map pem, portal_datasources pd 
+    select pem.element_id, pem.name, pem.sort_key, state, pd.description
+     from portal_element_map pem, portal_datasources pd, portal_pages pp
      where
-       portal_id = :portal_id 
+       pp.portal_id = :portal_id 
+       and pem.page_id = pp.page_id
        and pem.datasource_id  = pd.datasource_id
        and region = :region 
        and state != 'hidden'
@@ -45,9 +46,10 @@
     
     db_1row select_all_noimm_count \
 	    "select count(*) as all_count
-    from portal_element_map
+    from portal_element_map pem, portal_pages pp
     where
-    portal_id = :portal_id
+    pp.portal_id = :portal_id
+    and pp.page_id = pem.page_id
     and state != 'hidden'
     and region not like 'i%'"
     
@@ -60,9 +62,10 @@
     
     db_foreach hidden_elements {
 	select element_id, name
-	from portal_element_map pem
+	from portal_element_map pem, portal_pages pp
 	where
-	pem.portal_id = :portal_id 
+	pp.portal_id = :portal_id 
+        and pp.page_id = pem.page_id 
 	and pem.state = 'hidden'
 	order by name
     } {