Index: openacs-4/packages/new-portal/www/portal-config.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/Attic/portal-config.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/www/portal-config.adp	24 Oct 2001 22:46:55 -0000	1.4
+++ openacs-4/packages/new-portal/www/portal-config.adp	8 Nov 2001 19:47:55 -0000	1.5
@@ -1,67 +1,5 @@
-<master src="@master_template@">
-<property name="title">Edit Portal: <a href=portal-show?&portal_id=@portal_id@>@portal.name@</a></property>
-
-<form action="portal-update-name">
-Change Name:
-<P>
-<input type="text" name="new_name" value="@portal.name@">
-<%= [export_form_vars portal_id ] %>
-<center>
-<input type=submit value="Update Name">
-</form>
-</center>
-
-<P>
-
-<form method=get action="portal-config-2">
-<%= [export_form_vars portal_id ] %>
-<include src="@portal.template@" element_list="@element_list@" element_src="@element_src@">
-</form>
-
-<center>
-<form method=get action="revert">
-<%= [export_form_vars portal_id ] %>
-<input type=submit value="Revert To The Default">
-</form>
-</center>
-
-<form action="update_layout">
-<if @layout_count@ gt 1>
+<master src="master">
+<property name="title">Configure page: @name@</property>
 <p>
-Change Layout:
-<br>
 
-<table border=0>
-<tr>
-
-<multiple name="layouts">
-<td>
-  <table border=0>
-  <tr>
-  <td>
-   <input type=radio name=layout_id value="@layouts.layout_id@" <if @layout_id@ eq @layouts.layout_id@>checked</if>>
-    <b>@layouts.name@</b><br>
-    <table border=0 align=center>
-      <tr><td>
-        <include src="@layouts.resource_dir@/example" resource_dir="@layouts.resource_dir@">
-      </td></tr>
-    </table>
-    <font size=-1>
-    @layouts.description@
-    </font>
-  </td>
-  </tr>
-  </table>
-</td>
-</multiple>
-
-</tr>
-</table>
-</p>
-</if>
-
-<center>
-<input type=submit value="Update Layout">
-</center>
-</form>
-
+@rendered_page@
Index: openacs-4/packages/new-portal/www/portal-config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/Attic/portal-config.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/portal-config.tcl	24 Oct 2001 15:46:50 -0000	1.2
+++ openacs-4/packages/new-portal/www/portal-config.tcl	8 Nov 2001 19:47:11 -0000	1.3
@@ -10,51 +10,9 @@
     portal_id:naturalnum,notnull
 }
 
-# Check for permission
-ad_require_permission $portal_id portal_read_portal
-ad_require_permission $portal_id portal_edit_portal
+# Get the portal's name for the title
+set name [portal::get_name $portal_id]
 
-# Set up some template vars
-set master_template [ad_parameter master_template]
+set rendered_page [portal::configure $portal_id]
 
-# get the layouts
-set layout_count 0
-template::multirow create layouts layout_id name description filename resource_dir checked
-
-db_foreach get_layouts "
-select 
-layout_id, 
-name, 
-description, 
-filename, 
-resource_dir, 
-' ' as checked
-from portal_layouts 
-order by name "  {
-    set resource_dir "$resource_dir"
-    # I should be able to pass it a list, straight from db_list.
-    template::multirow append layouts $layout_id $name $description $filename $resource_dir $checked
-    incr layout_count
-}
-
-# get the portal.
-db_1row select_portal {
-    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
-} -column_array portal
-
-# fake some elements so that the <list> in the template has something to do.
-foreach region [ portal::get_regions $portal(layout_id) ] {
-    # pass the portal_id along here instead of the element_id.
-    lappend fake_element_ids($region) $portal_id
-}
-
-set element_list [array get fake_element_ids]
-set element_src "[portal::www_path]/place-element"
-
 ad_return_template