Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 28 Aug 2003 09:41:37 -0000 1.8 +++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 17 Sep 2003 11:20:30 -0000 1.9 @@ -42,8 +42,8 @@ @author Peter Marklund } { - set apm_title "ACS Package Manager Administration" - set apm_url "/acs-admin/apm" + set apm_title "Package Manager" + set apm_url "/acs-admin/apm/" if { [llength $args] == 0 } { set title $apm_title Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.adp 22 May 2003 13:59:05 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.adp 17 Sep 2003 11:20:30 -0000 1.3 @@ -1,5 +1,5 @@ @page_title;noquote@ -@context_bar;noquote@ +@context;noquote@ - \ No newline at end of file + Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl 28 Aug 2003 09:41:37 -0000 1.5 +++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl 17 Sep 2003 11:20:30 -0000 1.6 @@ -35,7 +35,7 @@ set page_title "Edit Tcl Callback" } -set context_bar [ad_context_bar [list "." "ACS Package Manager Administration"] [list "version-view?[export_vars { version_id }]" "$pretty_name $version_name"] [list $return_url "Tcl Callbacks"] $page_title] +set context [list [list "." "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] [list $return_url "Tcl Callbacks"] $page_title] set type_label "Tcl procedure name" ad_form -name callback -cancel_url $return_url -form { Index: openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl 11 Sep 2003 09:19:25 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl 17 Sep 2003 11:20:30 -0000 1.2 @@ -19,7 +19,7 @@ set context [list \ - [list "." "ACS Package Manager Administration"] \ + [list "." "Package Manager"] \ [list [export_vars -base "version-view" { version_id }] "$pretty_name $version_name"] \ [list $return_url "Tcl Callbacks"] $page_title] 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.5 -r1.6 --- openacs-4/packages/acs-admin/www/apm/version-callbacks.adp 11 Sep 2003 09:19:25 -0000 1.5 +++ openacs-4/packages/acs-admin/www/apm/version-callbacks.adp 17 Sep 2003 11:20:30 -0000 1.6 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context_bar;noquote@ +@context;noquote@

@@ -18,7 +18,7 @@

- For the upgrade callbacks, you should definitely check out the apm_upgrade_logic, which makes it very easy to handle the logic of which things to process depending on which version you're upgrading from and to. Index: openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl 11 Sep 2003 09:19:25 -0000 1.4 +++ openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl 17 Sep 2003 11:20:30 -0000 1.5 @@ -10,7 +10,7 @@ db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id" set page_title "Tcl Callbacks" -set context_bar [ad_context_bar [list "." "ACS Package Manager Administration"] [list "version-view?[export_vars { version_id }]" "$pretty_name $version_name"] $page_title] +set context [list [list "." "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] $page_title] set unused_callback_types [apm_unused_callback_types -version_id $version_id] Index: openacs-4/packages/acs-admin/www/apm/version-files.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-admin/www/apm/version-files.adp 17 Sep 2003 11:20:30 -0000 1.1 @@ -0,0 +1,5 @@ + + @page_title;noquote@ + @context;noquote@ + +@body;noquote@ Index: openacs-4/packages/acs-admin/www/apm/version-files.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-admin/www/apm/version-files.tcl 17 May 2003 09:36:29 -0000 1.12 +++ openacs-4/packages/acs-admin/www/apm/version-files.tcl 17 Sep 2003 11:20:30 -0000 1.13 @@ -12,13 +12,11 @@ set return_url "[ad_conn url]?[ad_conn query]" -set form "" -set apm_header_args [list "Files"] +set page_title "Files" +set context [list [list "/acs-admin/apm/" "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] $page_title] -doc_body_append "[eval [concat [list apm_header -form $form [list "version-view?version_id=$version_id" "$pretty_name $version_name"]] $apm_header_args]]" +append body " -doc_body_append " -

" @@ -27,7 +25,7 @@ set last_components [list] set counter 0 -doc_body_append " +append body "\n" foreach path [apm_get_package_files -package_key $package_key] { @@ -53,90 +51,90 @@ # For every changed component (at least the file name), write a row in the table. while { $i < [llength $components] } { - doc_body_append "" + append body "/" } else { - doc_body_append "" - doc_body_append " + append body "" + append body "" if { $installed_p == "t" } { set server_rel_path "packages/$package_key/$path" if { [apm_file_watchable_p $server_rel_path] } { if { [nsv_exists apm_reload_watch $server_rel_path] } { # This procs file is already being watched. - doc_body_append "" + append body "" } else { if {![ad_parameter -package_id [ad_acs_kernel_id] \ PerformanceModeP request-processor 1]} { # Provide a link to watch the procs file. - doc_body_append "" + append body "" } else { - doc_body_append "" + append body "" } } } else { - doc_body_append "" + append body "" } } } - doc_body_append "\n" + append body "\n" incr i } set last_components $components } if { [string equal $counter 0] } { - doc_body_append "\n" + append body "\n" } -doc_body_append "
PathFile type
PathFile type Database support
" + append body "
" for { set j 0 } { $j < $i } { incr j } { - doc_body_append "     " + append body "     " } if { $installed_p == "f" || [file exists "[acs_package_root_dir $package_key]/$path"] || $i < [llength $components] - 1} { # Either we're not looking at an installed package, or the file still exists, # so don't use when writing the name. - doc_body_append [lindex $components $i] + append body [lindex $components $i] } else { # This is an installed package, and a file has been removed from the filesystem. # Use to indicate that the file has been deleted. - doc_body_append "[lindex $components $i]" + append body "[lindex $components $i]" if { $i == [llength $components] - 1 } { lappend stricken_files $file_id } } if { $i < [llength $components] - 1 } { - doc_body_append "/ $file_pretty_name $db_pretty_name $file_pretty_name $db_pretty_name   being watched  being watched  watch  watch 
This package does not contain any registered files.
This package does not contain any registered files.
+append body "
" if { $installed_p == "t" } { - doc_body_append "" } elseif { [info exists tagged_p] } { if { $tagged_p == "t" } { - doc_body_append " - \ No newline at end of file + Index: openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl 29 Oct 2002 08:14:24 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl 17 Sep 2003 11:20:30 -0000 1.3 @@ -18,8 +18,8 @@ where version_id = :version_id } -set page_title "Manage Internationalization of $pretty_name $version_name" -set context_bar [ad_context_bar $page_title] +set page_title "Internationalization" +set context [list [list "/acs-admin/apm/" "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] $page_title] set num_cat_files [llength [glob -nocomplain "[acs_package_root_dir $package_key]/catalog/*.cat"]] Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-admin/www/apm/version-view.tcl 17 Sep 2003 11:08:09 -0000 1.13 +++ openacs-4/packages/acs-admin/www/apm/version-view.tcl 17 Sep 2003 11:20:30 -0000 1.14 @@ -134,7 +134,7 @@ db_release_unused_handles set page_title "$pretty_name $version_name" -set context [list [list "/acs-admin/apm/" "ACS Package Manager Administration"] $page_title] +set context [list [list "/acs-admin/apm/" "Package Manager"] $page_title] append body "