Index: openacs-4/packages/acs-admin/www/install/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/install/index.adp	18 Sep 2003 17:18:40 -0000	1.1
+++ openacs-4/packages/acs-admin/www/install/index.adp	2 Oct 2003 20:26:38 -0000	1.2
@@ -15,3 +15,10 @@
 <p>
   <b>&raquo;</b> <a href="@local_upgrade_url@">Upgrade your system</a>
 </p>
+
+<h2>Already Installed Packages</h2>
+
+<p><listfilters name="packages" style="inline-filters"></listfilters></p>
+
+<p><listtemplate name="packages"></listtemplate></p>
+
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.2 -r1.3
--- openacs-4/packages/acs-admin/www/install/index.tcl	18 Sep 2003 21:02:30 -0000	1.2
+++ openacs-4/packages/acs-admin/www/install/index.tcl	2 Oct 2003 20:26:38 -0000	1.3
@@ -1,11 +1,59 @@
 ad_page_contract {
     Package installation.
+} {
+    package_type:optional
 }
 
 set page_title "Install Software"
 
 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"
+        }
+    } -filters {
+        package_type {
+            label "Type"
+            default_value apm_application
+            where_clause {
+                t.package_type = :package_type
+            }
+            values {
+                {Application apm_application}
+                {Service apm_service}
+            }
+        }
+    }
+
+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 local_install_url "local-install"
 
 set local_service_install_url [export_vars -base "local-install" { { package_type apm_service } }]