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.4 -r1.4.2.1
--- openacs-4/packages/acs-admin/www/install/index.adp	4 Mar 2004 13:08:05 -0000	1.4
+++ openacs-4/packages/acs-admin/www/install/index.adp	17 Apr 2004 21:32:58 -0000	1.4.2.1
@@ -16,20 +16,12 @@
   </tr>
   <tr>
     <td>
-      <a href="@remote_install_url@">Install Application from Repository</a>
+      <a href="@remote_install_url@">Install from Repository</a>
     </td>
-    <td><a href="@local_install_url@">Install Application from Local</a></td>
+    <td><a href="@local_install_url@">Install from Local</a></td>
   </tr>
   <tr>
     <td>
-      <a href="@remote_service_install_url@">Install Service from Repository</a>
-    </td>
-    <td>
-      <a href="@local_service_install_url@">Install Service from Local</a>
-    </td>
-  </tr>
-  <tr>
-    <td>
       <a href="@remote_upgrade_url@">Upgrade from Repository</a>
     </td>
     <td>
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.6 -r1.6.4.1
--- openacs-4/packages/acs-admin/www/install/index.tcl	7 Nov 2003 11:38:47 -0000	1.6
+++ openacs-4/packages/acs-admin/www/install/index.tcl	17 Apr 2004 21:32:58 -0000	1.6.4.1
@@ -55,16 +55,17 @@
 }
 
 
-set local_install_url "install"
+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" { { package_type all } { upgrade_p 1 } }]
+set local_upgrade_url [export_vars -base "install" { { upgrade_p 1 } }]
 
+
 set repository_url "http://openacs.org/repository/[apm_get_repository_channel]/"
 
-set remote_install_url [export_vars -base "install" { repository_url }]
+set remote_install_url [export_vars -base "install" { repository_url { package_type apm_application } }]
 
 set remote_service_install_url [export_vars -base "install" { { package_type apm_service } repository_url }]
 
-set remote_upgrade_url [export_vars -base "install" { { package_type all } { upgrade_p 1 } repository_url }]
+set remote_upgrade_url [export_vars -base "install" { { upgrade_p 1 } repository_url }]
Index: openacs-4/packages/acs-admin/www/install/install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-admin/www/install/install.adp	4 Oct 2003 03:03:29 -0000	1.1
+++ openacs-4/packages/acs-admin/www/install/install.adp	17 Apr 2004 21:32:58 -0000	1.1.4.1
@@ -2,6 +2,8 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
+
+<listfilters name="packages" style="inline-filters"></listfilters>
 <if @packages:rowcount@ eq 0>
   <if @upgrade_p@ true>
     <p> No packages on your system need upgrading. </p>
@@ -14,8 +16,9 @@
       <p> There are no un-installed applications in the OpenACS repository. </p>
     </else>
   </else>
-  <p> <b>&raquo;</b> <a href=".">Go back to software installation</a>
 </if>
 <else>
-  <p><listtemplate name="packages"></listtemplate></p>
+  <listtemplate name="packages"></listtemplate>
 </else>
+
+<p> <b>&raquo;</b> <a href=".">Go back to software installation</a>
Index: openacs-4/packages/acs-admin/www/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.tcl,v
diff -u -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/acs-admin/www/install/install.tcl	26 Mar 2004 14:38:04 -0000	1.2.4.1
+++ openacs-4/packages/acs-admin/www/install/install.tcl	17 Apr 2004 21:32:58 -0000	1.2.4.2
@@ -1,7 +1,7 @@
 ad_page_contract {
     Install from local file system
 } {
-    {package_type "apm_application"}
+    package_type:optional
     {upgrade_p 0}
     {repository_url ""}
 }
@@ -32,7 +32,7 @@
     array unset version
     array set version $repository($package_key)
 
-    if {  [string equal $package_type "all"] || [string equal $version(package.type) $package_type] } {
+    if { ![exists_and_not_null package_type] || [string equal $version(package.type) $package_type] } {
         set package_key $version(package.key)
             
         # If in upgrade mode, only add to list if it's an upgrade
@@ -70,10 +70,11 @@
 }
 
 multirow extend packages install_url
-multirow foreach packages {
+multirow -unclobber foreach packages {
     set install_url [export_vars -base install-2 { package_key repository_url }]
 }
 
+
 # Build the list-builder list
 template::list::create \
     -name packages \
@@ -87,14 +88,18 @@
     } \
     -elements {
         package_name {
-            label "Application"
+            label "Package"
         }
         summary {
             label "Summary"
         }   
         version_name {
             label "Version"
         }
+        package_type {
+            label "Type"
+            display_eval {[ad_decode $package_type "apm_application" "Application" "Service"]}
+        }
         upgrade {
             label "Upgrade"
             hide_p {[ad_decode $upgrades_p 1 0 1]}
@@ -106,7 +111,25 @@
             link_html { title "Install single application" }
             display_template {Install}
         }
+    } -filters {
+        package_type {
+            label "Type"
+            values {
+                {Application apm_application}
+                {Service apm_service}
+            }
+        }
+        upgrade_p {
+            label "Upgrade"
+            values {
+                {"Install" 0}
+                {"Upgrade" 1}
+            }
+            default_value 0
+        }
+        repository_url {
+            hide_p 1
+        }
     }
 
 
-