Index: openacs-4/packages/acs-admin/www/apm/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/index.adp	17 Sep 2003 11:08:09 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-admin/www/apm/index.tcl	17 May 2003 09:36:29 -0000	1.16
+++ openacs-4/packages/acs-admin/www/apm/index.tcl	17 Sep 2003 11:08:09 -0000	1.17
@@ -12,7 +12,9 @@
     { reload_links_p 0 }
 }
 
-doc_body_append [apm_header]
+set page_title "Package Manager"
+set context [list $page_title]
+
 set user_id [ad_get_user_id]
 
 # Determine the user's email address.  If its not registered, put in a default.  
@@ -49,7 +51,7 @@
 
 set missing_text "<strong>No packages match criteria.</strong>"
 
-doc_body_append "<center><table><tr><td>[ad_dimensional $dimensional_list]</td></tr></table></center>"
+append body "<center><table><tr><td>[ad_dimensional $dimensional_list]</td></tr></table></center>"
 
 set use_watches_p [expr ! [ad_parameter -package_id [ad_acs_kernel_id] PerformanceModeP request-processor 1]]
 
@@ -114,7 +116,7 @@
     set reload_filter "<a href=\"$page_url&reload_links_p=1\">display reload links</a>"
 }
 
-doc_body_append "<h3>Packages</h3>
+append body "<h3>Packages</h3>
 
 <table width=\"100%\">
 <tr><td align=\"right\">$reload_filter</td</tr>
@@ -134,22 +136,22 @@
 if { $use_watches_p } {
     set watch_files [nsv_array names apm_reload_watch]
     if { [llength $watch_files] > 0 } {
-        doc_body_append "<h3>Watches</h3><ul>
+        append body "<h3>Watches</h3><ul>
 <li><a href=\"file-watch-cancel\">Stop watching all files</a></li><br />"
         foreach file [lsort $watch_files] {
             if { [string compare $file "."] } {
-                doc_body_append "<li>$file (<a href=\"file-watch-cancel?watch_file=[ns_urlencode $file]\">stop watching this file</a>)\n"
+                append body "<li>$file (<a href=\"file-watch-cancel?watch_file=[ns_urlencode $file]\">stop watching this file</a>)\n"
             }
         }
-        doc_body_append "</ul>\n"
+        append body "</ul>\n"
     }
 } else {
     set kernel_id [ad_acs_kernel_id]
-    doc_body_append "<h3>Watches</h3>
+    append body "<h3>Watches</h3>
 Watching of files is not enabled in performance mode (see the PerformanceModeP parameter on the <a href=\"/admin/site-map/parameter-set?package_id=$kernel_id&package_key=acs-kernel&section_name=all\">ACS Kernel parameter page</a>)"
 }
 
-doc_body_append "
+append body "
 <h3>Help</h3>
 
 <blockquote>
@@ -164,6 +166,4 @@
 information</i> on the next screen, and click <i>watch</i> next to
 the file's name on the following screen.
 </blockquote>
-
-[ad_footer]
 "
Index: openacs-4/packages/acs-admin/www/apm/version-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-view.adp	17 Sep 2003 11:08:09 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+@body;noquote@
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.12 -r1.13
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl	11 Sep 2003 08:35:56 -0000	1.12
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl	17 Sep 2003 11:08:09 -0000	1.13
@@ -84,7 +84,7 @@
     set status "[ad_decode $version_name_greater -1 "An older" "A newer"] version of this package,
 version $installed_version_name, is installed and [ad_decode $installed_enabled_p "t" "enabled" "disabled"]."
     if { $version_name_greater < 0 } {
-	doc_body_append " You may <a href=\"version-upgrade?version_id=$version_id\">upgrade to this version now</a>."
+	append body " You may <a href=\"version-upgrade?version_id=$version_id\">upgrade to this version now</a>."
     }
 }
 
@@ -132,8 +132,12 @@
 }
 
 db_release_unused_handles
-doc_body_append "[apm_header "$pretty_name $version_name"]
 
+set page_title "$pretty_name $version_name"
+set context [list [list "/acs-admin/apm/" "ACS Package Manager Administration"] $page_title]
+
+
+append body "
 $prompt_text
 
 <h3>Package Information</h3>
@@ -155,11 +159,11 @@
     set supported_databases [join $supported_databases_list ", "]
 }
 
-doc_body_append "
+append body "
 <tr valign=baseline><th align=left>Database Support:</th><td>$supported_databases</td></th></tr>
 "
 
-doc_body_append "
+append body "
 <tr valign=baseline><th align=left>CVS:</th><td>$cvs_status</td></tr>
 <tr valign=baseline><th align=left>[ad_decode [llength $owners] 1 "Owner" "Owners"]:</th><td>[join $owners "<br>"]</td></th></tr>
 <tr valign=baseline><th align=left>Package Key:</th><td>$package_key</td></th></tr>
@@ -172,34 +176,34 @@
 <tr valign=baseline><th align=left>Distribution File:</th><td>"
 
 if { ![empty_string_p $tarball_length] && $tarball_length > 0 } {
-    doc_body_append "<a href=\"packages/[file tail $version_uri]?version_id=$version_id\">[format "%.1f" [expr { $tarball_length / 1024.0 }]]KB</a> "
+    append body "<a href=\"packages/[file tail $version_uri]?version_id=$version_id\">[format "%.1f" [expr { $tarball_length / 1024.0 }]]KB</a> "
     if { [empty_string_p $distribution_uri] } {
-	doc_body_append "(generated on this system"
+	append body "(generated on this system"
 	if { ![empty_string_p $distribution_date] } {
-	    doc_body_append " on $distribution_date"
+	    append body " on $distribution_date"
 	}
-	doc_body_append ")"
+	append body ")"
     } else {
-	doc_body_append "(downloaded from $distribution_uri"
+	append body "(downloaded from $distribution_uri"
 	if { ![empty_string_p $distribution_date] } {
-	    doc_body_append " on $distribution_date"
+	    append body " on $distribution_date"
 	}
-	doc_body_append ")"
+	append body ")"
     }
 } else {
-    doc_body_append "None available"
+    append body "None available"
     if { $installed_p == "t" } {
-	doc_body_append " (<a href=\"version-generate-tarball?version_id=$version_id\">generate one now</a> from the filesystem)"
+	append body " (<a href=\"version-generate-tarball?version_id=$version_id\">generate one now</a> from the filesystem)"
     }
 }
 
-doc_body_append "
+append body "
 </td></tr>
 
 </table>
 "
 
-doc_body_append "
+append body "
 </blockquote>
 
 <ul>
@@ -223,37 +227,35 @@
     # As long as there isn't a different installed version, and this package is being
     # generated locally, allow the user to write a specification file for this version
     # of the package.
-    doc_body_append "<li><a href=\"version-generate-info?[export_vars { version_id }]&write_p=1\">Write an XML package specification to the <tt>packages/$package_key/$package_key.info</tt> file</a>\n"
+    append body "<li><a href=\"version-generate-info?[export_vars { version_id }]&write_p=1\">Write an XML package specification to the <tt>packages/$package_key/$package_key.info</tt> file</a>\n"
 }
 
 if { $installed_p == "t" } {
     if { [empty_string_p $distribution_uri] } {
 	# The distribution tarball was either (a) never generated, or (b) generated on this
 	# system. Allow the user to make a tarball based on files in the filesystem.
-	doc_body_append "<p><li><a href=\"version-generate-tarball?[export_vars { version_id }]\">Generate a distribution file for this package from the filesystem</a>\n"
+	append body "<p><li><a href=\"version-generate-tarball?[export_vars { version_id }]\">Generate a distribution file for this package from the filesystem</a>\n"
     }
 
-    doc_body_append "</ul><h4>Disable/Uninstall</h4><ul>"
+    append body "</ul><h4>Disable/Uninstall</h4><ul>"
 
     if { [info exists can_disable_p] } {
-	doc_body_append "<p><li><a href=\"version-disable?[export_vars { version_id }]\">Disable this version of the package</a>\n"
+	append body "<p><li><a href=\"version-disable?[export_vars { version_id }]\">Disable this version of the package</a>\n"
     }
     if { [info exists can_enable_p] } {
-	doc_body_append "<p><li><a href=\"version-enable?[export_vars { version_id }]\">Enable this version of the package</a>\n"
+	append body "<p><li><a href=\"version-enable?[export_vars { version_id }]\">Enable this version of the package</a>\n"
     }
     
-    doc_body_append "<p>"
+    append body "<p>"
     
     if { $installed_p == "t" } {	
-	doc_body_append "
+	append body "
 	<li><a href=\"package-delete?[export_vars { version_id }]\">Uninstall this package from your system.</a> (be very careful!)\n"
 	
     }
 }
 
-doc_body_append "
+append body "
 </ul>
-
-[ad_footer]
 "