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 -N -r1.24 -r1.25
--- openacs-4/packages/acs-admin/www/apm/packages-install.tcl	15 Jun 2015 11:10:10 -0000	1.24
+++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl	7 Aug 2017 23:47:45 -0000	1.25
@@ -7,12 +7,25 @@
 
 } {
     {checked_by_default_p:boolean 0}
+    {operation:word all}
 }
 
 set title "Package Installation"
 set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
 
+set dimensional_list {
+    {
+        operation "Operation:" all {
+	    { upgrade "Upgrade" {} }
+	    { install "Install" {} }
+	    { all "All" {} }
+	}
+    }
+}
 
+set dimensional_list [ad_dimensional $dimensional_list]
+
+
 ### Get all the spec files
 #
 # If a package is in the apm_workspace dir then we assume that that is
@@ -83,29 +96,38 @@
     append body {
         <h2>Select Packages to Install</h2><p>
         <p>Please select the set of packages you'd like to install.</p>
-    }
-
+    } [subst {
+        <div style="margin: 0 auto;">
+        $dimensional_list
+        </div>
+    }]
+    
     set formName "pkgsForm"
-    append body [subst {
+    template::add_event_listener \
+        -id check_all \
+        -script [subst {
+            var install_form = document.getElementsByName('$formName')\[0\];
+            for (var i = 0; i < install_form.length; ++i) {
+                install_form.elements\[i\].checked = true;
+                //install_form.elements\[i\].href = '';
+            }
+        }]
 
-        <script type="text/javascript">
-        function uncheckAll() {
+    template::add_event_listener \
+        -id uncheck_all \
+        -script [subst {
             var install_form = document.getElementsByName('$formName')\[0\];
-            for (var i = 0; i < [llength $spec_files]; ++i)
-            install_form.elements\[i\].checked = false;
-            this.href='';
-        }
-        function checkAll() {
-            var install_form = document.getElementsByName('$formName')\[0\];
-            for (var i = 0; i < [llength $spec_files]; ++i)
-            install_form.elements\[i\].checked = true;
-            this.href='';
-        }
-        </script>
-        <a href="packages-install?checked_by_default_p=0" onclick="javascript:uncheckAll();return false"><b>uncheck all boxes</b></a> |
-        <a href="packages-install?checked_by_default_p=1" onclick="javascript:checkAll(); return false"><b>check all boxes</b></a>
-    }]
+            for (var i = 0; i < install_form.length; ++i) {
+                install_form.elements\[i\].checked = false;
+            }
+        }]
 
+    append body {
+        <a href="#" id="uncheck_all"><b>uncheck all boxes</b></a> |
+        <a href="#" id="check_all"><b>check all boxes</b></a>
+    }
+    #packages-install?checked_by_default_p=1
+    
     append body "<form name='$formName' action='packages-install-2' method='post'>\n"
 
     # Client properties do not deplete the limited URL variable space.
@@ -123,7 +145,7 @@
             array set package [apm_read_package_info_file $spec_file]
         } errmsg] } {
             lappend errors "<li>Unable to parse $spec_file.  The following error was generated:
-        <blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote><p>"
+        <blockquote><pre>[ns_quotehtml $errmsg]</pre></blockquote><p>"
         } else {
             apm_log APMDebug "APM: Adding $package(package.key) to list for installation." 
             lappend pkg_info_list [pkg_info_new $package(package.key) $spec_file \
@@ -133,9 +155,9 @@
     }
     
     if { $checked_by_default_p } {
-        set widget [apm_package_selection_widget $pkg_info_list $pkg_key_list]
+        set widget [apm_package_selection_widget $pkg_info_list $pkg_key_list $operation]
     } else {
-        set widget [apm_package_selection_widget $pkg_info_list]
+        set widget [apm_package_selection_widget $pkg_info_list "" $operation]
     }
 
     if {$widget eq ""} {