Index: openacs-4/packages/acs-admin/www/install/local-install-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/Attic/local-install-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/install/local-install-2.adp 18 Sep 2003 17:18:40 -0000 1.1
+++ openacs-4/packages/acs-admin/www/install/local-install-2.adp 18 Sep 2003 17:33:37 -0000 1.2
@@ -2,15 +2,33 @@
@page_title;noquote@
@context;noquote@
-
This is the packagelist of packages we are going to install.
+
- Please click the link below to begin installation.
+ We're sorry. Some packages which are required in order to
+ install the packages you want could not be found.
+
+
+
+ The packages you wanted to install require some other
+ packages. These have been added to the list, and are marked
+ below.
+
+
+ This is the packagelist of packages we are going to install.
+
+ Please click the link below to begin installation.
+
+
» Install above packagepackages
+
+ Please hit the Back button in your browser and go back and remove the packages we cannot install.
+
+
Index: openacs-4/packages/acs-admin/www/install/local-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/Attic/local-install-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/install/local-install-2.tcl 18 Sep 2003 17:18:40 -0000 1.1
+++ openacs-4/packages/acs-admin/www/install/local-install-2.tcl 18 Sep 2003 17:33:37 -0000 1.2
@@ -4,11 +4,6 @@
package_key:multiple
}
-set page_title "Confirm"
-
-set context [list [list "." "Install Applications"] [list "local-install" "Install From Local File System"] $page_title]
-
-
# We save this under a different name
foreach key $package_key {
set install_p($key) 1
@@ -73,8 +68,13 @@
if { $ok_p } {
ad_set_client_property -clob t apm pkg_install_list $install_pkg_info_list
set continue_url local-install-3
+ set page_title "Confirm"
+} else {
+ set page_title "Missing Required Packages"
}
+set context [list [list "." "Install Applications"] [list "local-install" "Install From Local File System"] $page_title]
+
# Add the extras to the list
set package_key [concat $package_key $extra_package_keys]
@@ -102,7 +102,7 @@
$key \
$package_name($key) \
$problem_p \
- $comment \
+ [join $comment "
"] \
$extra_p
}
@@ -119,8 +119,9 @@
}
extra_p {
label "Added"
- display_eval {[ad_decode $extra_p 1 "Added" ""]}
+ display_eval {[ad_decode $extra_p 1 "*" ""]}
hide_p {[ad_decode $extras_p 1 0 1]}
+ html { align center }
}
}