Index: openacs-4/packages/acs-admin/www/install/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/install/index.tcl	27 Oct 2014 16:38:56 -0000	1.8
+++ openacs-4/packages/acs-admin/www/install/index.tcl	7 Aug 2017 23:47:45 -0000	1.9
@@ -4,63 +4,18 @@
     package_type:optional
 }
 
-set page_title "Install Software"
+set page_title "Install OpenACS Packages"
 set context [list $page_title]
 
-template::list::create \
-    -name packages \
-    -multirow packages \
-    -elements {
-        pretty_name {
-            label "Package"
-        }
-        version_name {
-            label "Version"
-        }
-        package_type_pretty {
-            label "Type"
-            hide_p 1
-        }
-    } -filters {
-        package_type {
-            label "Type"
-            default_value apm_application
-            where_clause {
-                t.package_type = :package_type
-            }
-            values {
-                {Application apm_application}
-                {Service apm_service}
-            }
-        }
-    }
+set local_install_url [export_vars -base [ad_conn package_url]/apm/packages-install { {operation install} }]
+set local_upgrade_url [export_vars -base [ad_conn package_url]/apm/packages-install { {operation upgrade} }]
+set local_path $::acs::rootdir/packages
 
-db_multirow -extend { package_type_pretty } packages packages "
-    select v.version_id, 
-           v.package_key, 
-           t.pretty_name, 
-           t.package_type,
-           v.version_name
-    from   apm_package_versions v, 
-           apm_package_types t
-    where  t.package_key = v.package_key
-    and    v.enabled_p = 't'
-    and    v.installed_p = 't'
-    [template::list::filter_where_clauses -and -name packages]
-    order  by t.package_type, t.pretty_name
-" {
-    set package_type_pretty [string totitle [lindex [split $package_type "_"] 1]]
-}
+set remote_install_url [export_vars -base "install/install" { repository_url channel current_channel head_channel }]
+set remote_upgrade_url [export_vars -base "install/install" { {upgrade_p 1} repository_url channel current_channel head_channel}]
 
-#set local_install_url [export_vars -base "install" { { package_type apm_application } }]
-#set local_service_install_url [export_vars -base "install" { { package_type apm_service } }]
-#set local_upgrade_url [export_vars -base "install" { { upgrade_p 1 } }]
-
-set local_install_url "[ad_conn package_url]/apm/packages-install"
-
-set repository_url "http://openacs.org/repository/"
-set head_channel [lindex [apm_get_repository_channels $repository_url] 0]
-set current_channel [apm_get_repository_channel]
-set channel $current_channel
-set remote_install_url [export_vars -base "install" { repository_url channel current_channel head_channel }]
-set remote_upgrade_url [export_vars -base "install" { { upgrade_p 1 } repository_url channel current_channel head_channel}]
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: