Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/apm/package-deinstall.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl,v
diff -u -r1.2 -r1.2.20.1
--- openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl	11 Dec 2003 21:39:45 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl	27 Sep 2013 18:47:52 -0000	1.2.20.1
@@ -9,12 +9,13 @@
     version_id:naturalnum
 }
 
-
 apm_version_info $version_id
 
-doc_body_append "[apm_header [list "version-view?version_id=$version_id" "$pretty_name $version_name"] "Deinstall"]"
+set title "Deinstall"
+set context [list [list "/acs-admin/apm/" "Package Manager"] \
+		 [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
+		 $title]
 
-
 db_transaction {
     doc_body_append "<ul>"
     apm_package_deinstall -callback apm_doc_body_callback $package_key
@@ -26,11 +27,7 @@
     }
 }
 
-doc_body_append "
-<p>
-Return to the <a href=\"index\">index</a>.
-[ad_footer]
-"
+append body "<p>Return to the <a href='index'>index</a>"
 
 
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/apm/package-delete-2.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl,v
diff -u -r1.7 -r1.7.12.1
--- openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	4 Jun 2006 00:45:20 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	27 Sep 2013 18:47:52 -0000	1.7.12.1
@@ -13,26 +13,34 @@
 
 
 if {![apm_version_installed_p $version_id]} {
-    doc_body_append "[apm_header "Package Deleted."]
-The version you have indicated has been deleted.<p>
-Return to the <a href=\"index\">index</a>.
-[ad_footer]
-"
-ad_script_abort
+    set title "Package Deleted"
+    set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
+    set body {The version you have indicated has been deleted.<p>
+	Return to the <a href="index">index</a>.
+    }
+} else {
+    apm_version_info $version_id
+
+    set title "Delete"
+    set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
+    set body ""
+    if { [catch {apm_package_delete \
+		     -sql_drop_scripts $sql_drop_scripts \
+		     -remove_files=0 \
+		     -callback apm_doc_body_callback $package_key} errmsg] } {
+	append body [subst {
+	    We encountered the following error when deleting package "$package_key":
+	    <pre><blockquote>[ad_quotehtml $errmsg]</blockquote></pre>
+	}]
+    } else {
+	append body {
+	    </ul>
+	    <p>You should restart the server now to make sure the memory footprint 
+	    and cache of the package is cleared out. <a href="../server-restart">Click here</a> 
+	    to restart the server now.</p>
+	}
+    }
 }
 
-apm_version_info $version_id
 
-doc_body_append [apm_header "Delete"]
 
-if { [catch {apm_package_delete -sql_drop_scripts $sql_drop_scripts -remove_files=0 -callback apm_doc_body_callback $package_key} errmsg] } {
-    doc_body_append "We encountered the following error when deleting package \"$package_key\":
-	<pre><blockquote>[ad_quotehtml $errmsg]</blockquote></pre>"
-}
-
-doc_body_append "
-</ul>
-<p>
-<p>You should restart the server now to make sure the memory footprint and cache of the package is cleared out. <a href=\"../server-restart\">Click here</a> to restart the server now.</p>
-[ad_footer]
-"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/apm/package-delete.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/apm/package-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete.tcl,v
diff -u -r1.9.8.4 -r1.9.8.5
--- openacs-4/packages/acs-admin/www/apm/package-delete.tcl	9 Sep 2013 16:44:16 -0000	1.9.8.4
+++ openacs-4/packages/acs-admin/www/apm/package-delete.tcl	27 Sep 2013 18:47:52 -0000	1.9.8.5
@@ -92,22 +92,24 @@
 </table>"
 } 
 
-set body "[apm_header -form "action=\"package-delete-2\" method=\"post\"" [list "version-view?version_id=$version_id" "$pretty_name $version_name"] "Delete"]
 
-$warning_text
+set title "Delete"
+set context [list [list "/acs-admin/apm/" "Package Manager"] \
+		 [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
+		 $title]
 
-<p>Deleting a package removes all record of it from the APM's database.</p>
+set body [subst {
+    <form action='package-delete-2' method='post'>
+    $warning_text
+    <p>Deleting a package removes all record of it from the APM's database.</p>
 
-<p>
+    [export_vars -form {version_id}]
+    $file_list
+   
+    <p>
+    <input type="submit" value="Delete Package">
+    </form>
+}]
 
-[export_vars -form {version_id}]
-$file_list
 
-<p>
-<input type=submit value=\"Delete Package\">
-</form>
-[ad_footer]"
 
-doc_return 200 text/html $body
-
-
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/apm/packages-install-2.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -r1.12.4.4 -r1.12.4.5
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	9 Sep 2013 16:44:16 -0000	1.12.4.4
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	27 Sep 2013 18:47:52 -0000	1.12.4.5
@@ -44,87 +44,93 @@
     }
 }
 
+set title "Package Installation"
+set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
+
 if {![info exists install_spec_files]} {
-    doc_body_append "[apm_header "Package Installation"]<p>
-No packages selected.<p>[ad_footer]"
-    return
-}
+    set body {
+	<p>
+	No packages selected.<p>
+    }
+} else {
 
-### Dependency Check
-set dependency_results [apm_dependency_check -pkg_info_all $pkg_info_list $install_spec_files]
+    ### Dependency Check
+    set dependency_results [apm_dependency_check -pkg_info_all $pkg_info_list $install_spec_files]
 
-if { [lindex $dependency_results 0] == 1 && [llength [lindex $dependency_results 2]] > 0 } {
+    if { [lindex $dependency_results 0] == 1 && [llength [lindex $dependency_results 2]] > 0 } {
 
-    set extra_package_keys [lindex $dependency_results 2]
+	set extra_package_keys [lindex $dependency_results 2]
 
-    # Check was good after adding a couple more packages
+	# Check was good after adding a couple more packages
 
-    doc_body_append "[apm_header "Package Installation"]
-    <h2>Additional Packages Automatically Added</h2><p>
+	set body [subst {
+	    <h2>Additional Packages Automatically Added</h2><p>
     
-    Some of the packages you were trying to install required other packages to be installed first.
-    We've added these additional packages needed, and ask you to review the list of packages below.
+	    Some of the packages you were trying to install required other packages to be installed first.
+	    We've added these additional packages needed, and ask you to review the list of packages below.
 
-    <form action=\"packages-install-2\" method=\"post\">
-    [export_vars -form {spec_files}]<p>
-    
-    <blockquote>
-    <table>
-    "
+	    <form action="packages-install-2" method="post">
+	    [export_vars -form {spec_files}]<p>
+	    
+	    <blockquote>
+	    <table>
+	}]
 
-    set install [concat $install $extra_package_keys]
-    set enable [concat $enable $extra_package_keys]
+	set install [concat $install $extra_package_keys]
+	set enable [concat $enable $extra_package_keys]
     
-    doc_body_append [apm_package_selection_widget [lindex $dependency_results 1] $install $enable]
+	append body [apm_package_selection_widget [lindex $dependency_results 1] $install $enable]
 
-    doc_body_append "
-    </table></blockquote>
-    <input type=submit value=\"Select Data Model Scripts\">
-    </form>
-    [ad_footer]
-    "
+	append body [subst {
+	    </table></blockquote>
+	    <input type=submit value="Select Data Model Scripts">
+	    </form>
+	}]
+	
+    } elseif { ([lindex $dependency_results 0] == 1) || $force_p eq "t" } {
 
-} elseif { ([lindex $dependency_results 0] == 1) || $force_p eq "t" } {
-    ### Check passed!  Initiate install.
+	### Check passed!  Initiate install.
 
-    # We use client properties to pass along this information as it is fairly large.
-    ad_set_client_property -clob t apm pkg_install_list [lindex $dependency_results 1]
-    ad_set_client_property -clob t apm pkg_enable_list $enable
+	# We use client properties to pass along this information as it is fairly large.
+	ad_set_client_property -clob t apm pkg_install_list [lindex $dependency_results 1]
+	ad_set_client_property -clob t apm pkg_enable_list $enable
 
-    ad_returnredirect packages-install-3
-    ad_script_abort
-} else {
-    ### Check failed.  Offer user an explanation and an ability to select unselect packages.
-    doc_body_append "[apm_header "Package Installation"]
-    <h2>Select Packages to Install</h2><p>
-    
-    Some of the packages you are trying to install have unsatisfied dependencies.  The packages
-    with unsatisfied dependencies have been deselected.  If you wish to install packages that do
-    not pass dependencies, please click the \"force\" option below.
-    <form action=\"packages-install-2\" method=\"post\">
-    
-    <ul>
-    <li>To <b>install</b> a package is to load its data model.
-    <li>To <b>enable</b> a package is to make it available to users.
-    </ul>
-    
-    If you think you might want to use a package later (but not right away),
-    install it but don't enable it.
-    
-    [export_vars -form {spec_files}]<p>
-    
-    <blockquote>
-    <table>
-    "
-    
-    doc_body_append [apm_package_selection_widget [lindex $dependency_results 1] $install $enable]
+	ad_returnredirect packages-install-3
+	ad_script_abort
 
+    } else {
+
+	### Check failed.  Offer user an explanation and an ability to
+	### select unselect packages.
+	
+	set body [subst {
     
-    doc_body_append "
-    </table></blockquote>
-    <input type=checkbox name=force_p value=\"t\"> <strong>Force the install<p></strong>
-    <input type=submit value=\"Select Data Model Scripts\">
-    </form>
-    [ad_footer]
-    "
+	    Some of the packages you are trying to install have unsatisfied dependencies.  The packages
+	    with unsatisfied dependencies have been deselected.  If you wish to install packages that do
+	    not pass dependencies, please click the "force" option below.
+	    <form action="packages-install-2" method="post">
+	    
+	    <ul>
+	    <li>To <b>install</b> a package is to load its data model.
+	    <li>To <b>enable</b> a package is to make it available to users.
+	    </ul>
+	    
+	    If you think you might want to use a package later (but not right away),
+	    install it but don't enable it.
+	    
+	    [export_vars -form {spec_files}]<p>
+	    
+	    <blockquote>
+	    <table>
+	}]
+    
+	append body \
+	    [apm_package_selection_widget [lindex $dependency_results 1] $install $enable] \
+	    [subst {
+		</table></blockquote>
+		<input type="checkbox" name="force_p" value="t"> <strong>Force the install<p></strong>
+		<input type="submit" value="Select Data Model Scripts">
+		</form>
+	    }]
+    }
 }
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/apm/packages-install-3.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl,v
diff -u -r1.14.8.1 -r1.14.8.2
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	27 Aug 2013 11:44:43 -0000	1.14.8.1
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	27 Sep 2013 18:47:52 -0000	1.14.8.2
@@ -8,21 +8,18 @@
 } {
 
 }
+set title "Package Installation"
+set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
+set body {
+    <h2>Select Data Model Scripts to Run</h2>
+    <p>
+    Check all the files you want to be loaded into the database.<p>
+    <form action="packages-install-4" method="post">
+}
 
-set pkg_install_list [ad_get_client_property apm pkg_install_list]
-set body ""
-
-append body "[apm_header "Package Installation"]
-<h2>Select Data Model Scripts to Run</h2>
-<p>
-
-Check all the files you want to be loaded into the database.<p>
-<form action=\"packages-install-4\" method=\"post\">
-"
-
 set sql_file_list [list]
 set file_count 0
-foreach pkg_info $pkg_install_list {
+foreach pkg_info [ad_get_client_property apm pkg_install_list] {
 
     set package_key [pkg_info_key $pkg_info]
     set package_path [pkg_info_path $pkg_info]
@@ -97,10 +94,7 @@
     ad_script_abort
 }
 
-append body "
-<input type=submit value=\"Install Packages\">
-</form>
-[ad_footer]
-"
-
-doc_return 200 text/html $body
+append body {
+    <input type=submit value="Install Packages">
+    </form>
+}