Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	17 Oct 2010 21:06:07 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	27 Oct 2014 16:38:53 -0000	1.8
@@ -4,15 +4,18 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
 }
 
-db_1row  apm_package_info_by_version_id {}
+db_1row apm_package_info_by_version_id {}
 
-doc_body_append "[apm_header [list "version-view?version_id=$version_id" "$pretty_name $version_name"] "Dependencies"]
+set title "Dependencies"
+set context [list \
+		 [list "/acs-admin/apm/" "Package Manager"] \
+		 [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
+		 $title]
+set body ""
 
-"
-
 foreach dependency_type { provide require extend embed } {
 
     set dependency_type_prep "${dependency_type}s"
@@ -21,13 +24,14 @@
     } else {
         set dependency_type_prep_2 ${dependency_type}ed
     }
-    doc_body_append "<h3>Services [string totitle $dependency_type_prep_2]</h3><ul>\n"
+    append body "<h3>Services [string totitle $dependency_type_prep_2]</h3><ul>\n"
 
     db_foreach apm_all_dependencies {} {
-	doc_body_append "<li>[string totitle $dependency_type_prep] service $service_uri, version $service_version"
-
+	append body "<li>[string totitle $dependency_type_prep] service $service_uri, version $service_version "
+	
         if { $dependency_type ne "provide" } {
-            doc_body_append "(<a href=\"version-dependency-remove?[export_url_vars package_key dependency_id version_id dependency_type]\">remove</a>)\n"
+	    set qvars [export_vars -url {package_key dependency_id version_id dependency_type}]
+            append body "(<a href=\"version-dependency-remove?$qvars\">remove</a>)\n"
         }
 	
 	# If this package provides a service, show a list of all packages that require it,
@@ -42,31 +46,35 @@
 	db_foreach apm_specific_version_dependencies {} {
             incr counter
 	    if { $counter == 1 } {
-		doc_body_append "<ul>\n"
+		append body "<ul>\n"
 	    }
             switch $dep_type {
                 provides { set dep_d provided }
                 requires { set dep_d required }
                 extends { set dep_d extended }
                 embeds { set dep_d embeds }
             } 
-	    doc_body_append "<li>[string totitle $dep_d] by <a href=\"version-view?version_id=$dep_version_id\">$dep_pretty_name, version $dep_version_name</a>\n"
+	    append body [subst {
+		<li>[string totitle $dep_d] by <a href="version-view?version_id=$dep_version_id">$dep_pretty_name, 
+		version $dep_version_name</a>
+	    }]
 	}
 	if { $counter != 0 } {
-	    doc_body_append "</ul>\n"
-	}	
+	    append body "</ul>\n"
+	}
     } else {
-	doc_body_append "<li>This package does not $dependency_type any services.\n"
+	append body "<li>This package does not $dependency_type any services.\n"
     }
-    if { $installed_p eq "t" && $dependency_type ne "provide"} {
-	doc_body_append "<li><a href=\"version-dependency-add?[export_url_vars version_id dependency_type]\">Add a service $dependency_type_prep_2 by this package</a>\n"
+    if { $installed_p == "t" && $dependency_type ne "provide"} {
+	append body [subst {
+	    <li><a href="version-dependency-add?[export_vars -url {version_id dependency_type}]">Add a 
+	    service $dependency_type_prep_2 by this package</a>
+	}]
     }
-    doc_body_append "</ul>\n"
+    append body "</ul>\n"
 }
 
-db_release_unused_handles
-doc_body_append "
-</ul>
-[ad_footer]
-"
+append body "</ul>\n"
 
+ad_return_template apm
+