Index: openacs-4/contrib/packages/portal/www/admin/add-applications-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/add-applications-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/admin/add-applications-2.tcl	12 Feb 2004 21:31:21 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/admin/add-applications-2.tcl	11 Mar 2004 23:37:41 -0000	1.3
@@ -15,6 +15,9 @@
 set node_id [site_node::get_node_id_from_object_id -object_id $package_id]
 set portals [db_list get_portals {}]
 
+# This needs rewriting!!!! Drive by portal datasources ... and have them mount
+# the package if needed ...
+
 db_transaction {
     foreach one_application $application {
 
@@ -35,12 +38,21 @@
 
             foreach portal $portals {
                 foreach datasource $datasources {
-                    portal::element::new \
-                        -portal_id $portal \
-                        -state hidden \
-                        -application_id $application_id \
-                        -datasource_name $datasource \
-                        -configure_params
+                    db_transaction {
+                        set element_id [portal::element::new \
+                                           -portal_id $portal \
+                                           -state hidden \
+                                           -datasource_name $datasource]
+
+                        portal::element::parameter::set_value \
+                            -element_id $element_id \
+                            -key package_id \
+                            -value $application_id
+
+                        portal::element::initialize \
+                          -datasource_name $datasource \
+                          -element_id $element_id
+                    }
                 }
             }
 
Index: openacs-4/contrib/packages/portal/www/admin/add-applications.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/add-applications.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/admin/add-applications.adp	12 Feb 2004 21:31:21 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/admin/add-applications.adp	11 Mar 2004 23:37:41 -0000	1.3
@@ -1,9 +1,11 @@
 <master>
   <property name="title">Add portalled applications</property>
   <property name="context">@context;noquote@</property>
+
+  <i>The portlets for the applications you select will be automatically added to the
+  @portal_count@ portals that belong to this instance of the portals package.  This may
+  take a fairly long time, so be patient.</i>
+  <p>
    
-<i>The portlets for the applications you select will be automatically added to the
-@portal_count@ portals that belong to this instance of the portals package.  This may
-take a fairly long time, so be patient.</i>
-<p>
-<listtemplate name="applications"></listtemplate></p>
+  <include src="/packages/portal/lib/add-applications">
+</master>
Index: openacs-4/contrib/packages/portal/www/admin/add-applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/add-applications.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/admin/add-applications.tcl	12 Feb 2004 21:31:21 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/admin/add-applications.tcl	11 Mar 2004 23:37:41 -0000	1.3
@@ -1,4 +1,5 @@
 ad_page_contract {
+
     Generate a list of applications that have supporting portlets that have not
     yet been added to this portal package instance.
 
@@ -7,37 +8,6 @@
     @cvs-id $Id$
 } { }
 
-set package_id [ad_conn package_id]
-set return_url [ad_conn url]
 set context [list "Add Applications"]
 
-db_1row get_portal_count {}
-
-db_multirow -extend {add_url} applications get_applications {} {
-    set add_url [export_vars -base add-applications-2 { application return_url }]
-}
-
-# Build the list-builder list
-template::list::create \
-    -name applications \
-    -multirow applications \
-    -key application \
-    -bulk_actions {
-        "Add checked applications" "add-applications-2" "Add checked applications"
-    } \
-    -bulk_action_export_vars {
-        application return_url
-    } \
-    -elements {
-        application {
-            label "Application"
-        }
-        add {
-            label Add
-            link_url_col add_url
-            link_html { title "Add single application" }
-            display_template {Add}
-        }
-    }
-
 ad_return_template
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/www/admin/add-applications.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/portal/www/admin/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/configure.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/admin/configure.adp	12 Feb 2004 21:31:21 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/admin/configure.adp	11 Mar 2004 23:37:41 -0000	1.3
@@ -1,5 +1,4 @@
 <master>
-<property name="title">Configuration</property>
-<a href="add-applications">Add a new application and its associated portlets</a>
-<br>
-<a href="/foo">Add the test portal</a>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<include src="@wizard:current_url@">