Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	5 Mar 2003 14:43:12 -0000	1.5.2.1
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	2 Jul 2003 19:50:36 -0000	1.5.2.2
@@ -14,6 +14,9 @@
 # Install and enable are sets of keys; need to turn them back into spec files.
 set spec_files [ad_get_client_property apm spec_files]
 
+# LARS HACK: I got rid of the separate install/enable checkboxes
+set install $enable
+
 # Clear out previous client properties.
 ad_set_client_property -clob t apm pkg_install_list ""
 ad_set_client_property -clob t apm pkg_enable_list ""
Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v
diff -u -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-admin/www/apm/packages-install.tcl	24 Mar 2003 10:31:46 -0000	1.12.2.2
+++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl	2 Jul 2003 19:50:36 -0000	1.12.2.3
@@ -11,7 +11,7 @@
 }
 
 ad_return_top_of_page "[apm_header "Package Installation"]
-<p>Please wait while the installer loads ........<p>
+<p>Please wait while the installer searches your system for packages to install ...<p>
 
 "
 
@@ -74,31 +74,18 @@
     
     ns_write "
     <h2>Select Packages to Install</h2><p>
-    Please select the set of packages you'd like to install
-    and enable.
+    <p>Please select the set of packages you'd like to install.</p>"
 
-    <ul>
-    <li>To <b>install</b> a package is to load its data model.
-    <li>To <b>enable</b> a package is to make it available to users.
-    </ul>
-    
-    If you think you might want to use a package later (but not right away),
-    install it but don't enable it.<p>"
-
-    if { [llength $not_compatible_list] > 0 } {
-        ns_write "<p>If there's a package that you can't find in the list below, it may be because it's <a href=\"#incompatible\">incompatible</a> with your system. </p>"
-    }
-
     ns_write "
 
 <script language=javascript>
 function uncheckAll() {
-    for (var i = 0; i < [expr [llength $spec_files] * 2]; ++i)
+    for (var i = 0; i < [expr [llength $spec_files] ]; ++i)
         document.forms\[0\].elements\[i\].checked = false;
     this.href='';
 }
 function checkAll() {
-    for (var i = 0; i < [expr [llength $spec_files] * 2]; ++i)
+    for (var i = 0; i < [expr [llength $spec_files] ]; ++i)
         document.forms\[0\].elements\[i\].checked = true;
     this.href='';
 }
@@ -163,14 +150,15 @@
 }
 
 if { [llength $not_compatible_list] > 0 } {
-    ns_write "<h3><a name=\"incompatible\">Incompatible Packages</a></h3><ul><li>[join $not_compatible_list "<li>"]</ul>"
+    ns_log Notice "APM packages-install: Incompatible Packages\n- [join $not_compatible_list "\n- "]"
 }
 
 if { [llength $already_installed_list] > 0 } {
-    ns_write "<h3>Already Installed Packages</h3><ul><li>[join $already_installed_list "<li>"]</ul>"
+    ns_log Notice "APM packages-install: Already Installed Packages\n- [join $already_installed_list "\n- "]"
 }
 
 
+
 ns_write "
 [ad_footer]
 " 
Index: openacs-4/packages/acs-admin/www/apm/version-callbacks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callbacks.adp,v
diff -u -r1.2.2.3 -r1.2.2.4
--- openacs-4/packages/acs-admin/www/apm/version-callbacks.adp	12 Jun 2003 08:30:15 -0000	1.2.2.3
+++ openacs-4/packages/acs-admin/www/apm/version-callbacks.adp	2 Jul 2003 19:50:36 -0000	1.2.2.4
@@ -35,7 +35,7 @@
 <h3>Help</h3>
 
 <p>
-  Here's the list of available callbacks and the parameters they will be called with.
+  Below is the list of available callbacks and the parameters they will be called with. Note that the parameters are sent as named parameters.
 </p>
 
 <p>
@@ -80,8 +80,8 @@
       before-upgrade
     </td>
     <td>
-      from_version_name
-      to_version_name
+      -from_version_name
+      -to_version_name
     </td>
   </tr>
 
@@ -90,8 +90,8 @@
       after-upgrade
     </td>
     <td>
-      from_version_name
-      to_version_name
+      -from_version_name
+      -to_version_name
     </td>
   </tr>
 
@@ -109,7 +109,7 @@
       after-instantiate
     </td>
     <td>
-      package_id      
+      -package_id      
     </td>
   </tr>
 
@@ -118,7 +118,7 @@
       before-uninstantiate
     </td>
     <td>
-      package_id
+      -package_id
     </td>
   </tr>
 
@@ -127,8 +127,8 @@
       after-mount
     </td>
     <td>
-      package_id
-      node_id
+      -package_id
+      -node_id
     </td>
   </tr>
 
@@ -137,8 +137,8 @@
       before-unmount
     </td>
     <td>
-      package_id 
-      node_id
+      -package_id 
+      -node_id
     </td>
   </tr>