Index: openacs-4/packages/new-portal/www/layouts/simple3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/layouts/simple3.adp	29 Mar 2002 18:48:29 -0000	1.2
+++ openacs-4/packages/new-portal/www/layouts/simple3.adp	11 Jun 2002 04:21:27 -0000	1.3
@@ -18,23 +18,57 @@
 
 %>
 
-  <!-- A simple 3-column thingy. -->
-  <table border=0 width="100%">
-    <tr>
-      <td valign=top width="33%">
-        <list name="element_ids_1">
-          <include src="@element_src@" element_id="@element_ids_1@" region="1"><br>
-        </list>
-      </td>
-      <td valign=top width="34%">
-        <list name="element_ids_2">
-          <include src="@element_src@" element_id="@element_ids_2@" region="2"><br>
-        </list>
-      </td>
-      <td valign=top width="33%">
-        <list name="element_ids_3">
-          <include src="@element_src@" element_id="@element_ids_3@" region="3"><br>
-        </list>
-      </td>
-    </tr>
-  </table>
+<!-- A simple 3-column layout. -->
+
+<table border="0" width="100%">
+  <tr>
+    <td valign="top" width="33%">
+      <list name="element_ids_1">
+        <include src="@element_src@"
+                 element_id="@element_ids_1:item@"
+                 action_string="@action_string@"
+                 theme_id="@theme_id@"
+                 region="1"
+                 portal_id="@portal_id@"
+                 edit_p="@edit_p@"
+                 return_url="@return_url@"
+                 hide_links_p="@hide_links_p@"
+                 page_id="@page_id@"
+                 layout_id="@layout_id@">
+        <br>
+      </list>
+    </td>
+    <td valign="top" width="33%">
+      <list name="element_ids_2">
+        <include src="@element_src@"
+                 element_id="@element_ids_2:item@"
+                 action_string="@action_string@"
+                 theme_id="@theme_id@"
+                 region="2"
+                 portal_id="@portal_id@"
+                 edit_p="@edit_p@"
+                 return_url="@return_url@"
+                 hide_links_p="@hide_links_p@"
+                 page_id="@page_id@"
+                 layout_id="@layout_id@">
+        <br>
+      </list>
+    </td>
+    <td valign="top" width="33%">
+      <list name="element_ids_3">
+        <include src="@element_src@"
+                 element_id="@element_ids_3:item@"
+                 action_string="@action_string@"
+                 theme_id="@theme_id@"
+                 region="3"
+                 portal_id="@portal_id@"
+                 edit_p="@edit_p@"
+                 return_url="@return_url@"
+                 hide_links_p="@hide_links_p@"
+                 page_id="@page_id@"
+                 layout_id="@layout_id@">
+        <br>
+      </list>
+    </td>
+  </tr>
+</table>
Index: openacs-4/packages/new-portal/www/layouts/simple3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple3.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/layouts/simple3.tcl	29 Mar 2002 18:48:29 -0000	1.2
+++ openacs-4/packages/new-portal/www/layouts/simple3.tcl	11 Jun 2002 04:21:27 -0000	1.3
@@ -14,12 +14,35 @@
 #  details.
 #
 
-# www/templates/simple3.tcl
 ad_page_contract {
-    @cvs_id $Id$
+    This is a simple 3 column layout called from portal::render and the like. 
+    It lays out the elements with portal::layout_elements and hands off
+    rendering of the individual portlets to the template in the
+    "element_src" var
+
+    @author arjun@openforce.net
+    @author yon@openforce.net
+    @version $Id$
 } -properties {
     element_list:onevalue
     element_src:onevalue
+    action_string:onevalue
+    theme_id:onevalue
+    return_url:onevalue
 }
 
-portal_layout_elements $element_list
+if {![exists_and_not_null action_string]} {
+    set action_string ""
+}
+
+if {![exists_and_not_null theme_id]} {
+    set theme_id ""
+}
+
+if {![exists_and_not_null return_url]} {
+    set return_url ""
+}
+
+portal::layout_elements $element_list
+
+ad_return_template