Index: openacs-4/packages/acs-admin/www/apm/package-load-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-load-2.tcl,v
diff -u -r1.4.10.1 -r1.4.10.2
--- openacs-4/packages/acs-admin/www/apm/package-load-2.tcl 28 Sep 2013 17:53:20 -0000 1.4.10.1
+++ openacs-4/packages/acs-admin/www/apm/package-load-2.tcl 28 Sep 2013 19:14:24 -0000 1.4.10.2
@@ -76,7 +76,7 @@
} else {
# Not sure what to do... stop.
ns_write "The specified file path is not an APM file or a directory. Please try
- entering a new file path.[ad_footer]"
+ entering a new file path."
return
}
}
Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v
diff -u -r1.35.8.4 -r1.35.8.5
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 28 Sep 2013 17:54:43 -0000 1.35.8.4
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 28 Sep 2013 19:14:24 -0000 1.35.8.5
@@ -576,7 +576,7 @@
if { [catch {apm_transfer_file -url $url -output_file_name $file_path} errmsg] } {
apm_callback_and_log $callback "Unable to download. Please check your URL..
The following error was returned: [ad_quotehtml $errmsg]
-
[ad_footer]"
+ "
return
}
Index: openacs-4/packages/acs-templating/tcl/paginator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/paginator-procs.tcl,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/acs-templating/tcl/paginator-procs.tcl 5 Sep 2013 11:38:46 -0000 1.19.2.1
+++ openacs-4/packages/acs-templating/tcl/paginator-procs.tcl 28 Sep 2013 19:14:24 -0000 1.19.2.2
@@ -112,24 +112,29 @@
#
if { ($row_ids eq {} && ![::cache exists $cache_key]) || ([info exists opts(flush_p)] && $opts(flush_p) eq "t") } {
if { [info exists opts(printing_prefs)] && $opts(printing_prefs) ne "" } {
- ReturnHeaders "text/html"
- ns_write "
-
-"
set title [lindex $opts(printing_prefs) 0]
- ns_write "$title
- "
set stylesheet [lindex $opts(printing_prefs) 1]
if { $stylesheet ne "" } {
- ns_write ""
+ set css_link ""
+ } else {
+ set css_link ""
}
- ns_write ""
- ns_write ""
+
+ ad_return_top_of_page [subst {
+
+
+$title
+
+$css_link
+
+
+ }]
set header_file [lindex $opts(printing_prefs) 3]
if { $header_file ne "" } {
ns_write [ns_adp_parse -file $header_file]
@@ -157,7 +162,6 @@
Click here to Continue
"
}
- ns_write [ad_footer]
ad_script_abort
} else {
init $statement_name $name $query