Index: openacs-4/packages/acs-admin/www/apm/file-watch-cancel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/file-watch-cancel.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/file-watch-cancel.tcl	13 Mar 2003 14:54:55 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/file-watch-cancel.tcl	4 Apr 2003 09:19:59 -0000	1.5
@@ -8,24 +8,8 @@
     @cvs-id $Id$
 } {
     {watch_file ""}
+    {return_url ""}
 }
+apm_file_watch_cancel $watch_file
 
-doc_body_append "[apm_header "Cancel a Watch"]
-"
-
-apm_file_watch_cancel -path $watch_file
-
-if { ![empty_string_p $watch_file] } {
-    doc_body_append "No longer watching the following file:<ul><li>$watch_file</ul>"
-} else {
-    doc_body_append "Canceled all watches"
-}
-
-
-doc_body_append "
-<p>
-<a href=\"./\">Return to the Package Manager</a>
-</p>
-
-[ad_footer]
-"
+ad_returnredirect $return_url
Index: openacs-4/packages/acs-admin/www/apm/file-watch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/file-watch.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/apm/file-watch.tcl	2 Apr 2003 16:02:40 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/file-watch.tcl	4 Apr 2003 09:19:59 -0000	1.11
@@ -9,26 +9,13 @@
 } {
     version_id:integer
     paths:multiple
+    {return_url ""}
 } 
 
-apm_version_info $version_id
+set package_key [apm_package_key_from_version_id $version_id]
 
-set count 0
 foreach path $paths {
-    incr count
-
     apm_file_watch "packages/$package_key/$path"
-
-    lappend path_list $path
 }
 
-doc_body_append "[apm_header -form "method=post action=\"file-add-2\"" [list "version-view?version_id=$version_id" "$pretty_name $version_name"] [list "version-files?version_id=$version_id" "Files"] "Watch file"]"
-
-
-doc_body_append "Marking the following files to be watched:<ul><li>[join $path_list "<li>"]</ul>
-
-<a href=\"version-files?version_id=$version_id\">Return to the list of files for $pretty_name $version_name</a><br>
-<a href=\"./\">Return to the Package Manager</a>
-
-[ad_footer]
-"
+ad_returnredirect $return_url
Index: openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl	4 Apr 2003 09:19:59 -0000	1.1
@@ -0,0 +1,13 @@
+ad_page_contract {
+    Cancels all watches in given package.
+
+    @author Peter Marklund
+    @cvs-id $Id: package-watch-cancel.tcl,v 1.1 2003/04/04 09:19:59 peterm Exp $
+} {
+    package_key
+    {return_url "index"}
+} 
+
+apm_cancel_all_watches $package_key
+
+ad_returnredirect $return_url
Index: openacs-4/packages/acs-admin/www/apm/package-watch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-watch.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/apm/package-watch.tcl	25 Feb 2003 16:57:20 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/package-watch.tcl	4 Apr 2003 09:19:59 -0000	1.2
@@ -6,8 +6,9 @@
     @cvs-id $Id$
 } {
     package_key
+    {return_url "index"}
 } 
 
 apm_watch_all_files $package_key
 
-ad_returnredirect "index"
\ No newline at end of file
+ad_returnredirect $return_url
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.10 -r1.11
--- openacs-4/packages/acs-admin/www/apm/version-files.tcl	2 Apr 2003 15:58:18 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/version-files.tcl	4 Apr 2003 09:19:59 -0000	1.11
@@ -10,6 +10,8 @@
 
 apm_version_info $version_id
 
+set return_url "[ad_conn url]?[ad_conn query]"
+
 set form ""
 set apm_header_args [list "Files"]
 
@@ -79,12 +81,12 @@
 		    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 "<td>&nbsp;watch&nbsp;</td>"
+			    doc_body_append "<td>&nbsp;being watched&nbsp;</td>"
 			} 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 "<td>&nbsp;<a href=\"file-watch?version_id=$version_id&paths=$path\">watch</a>&nbsp;</td>"
+				doc_body_append "<td>&nbsp;<a href=\"file-watch?[export_vars -url {version_id {paths $path} return_url}]\">watch</a>&nbsp;</td>"
 			    } else {
 				doc_body_append "<td></td>"
 			    }
@@ -111,7 +113,8 @@
 
 if { $installed_p == "t" } {
     doc_body_append "<ul>
-    <li><a href=\"package-watch?package_key=$package_key\">watch all files</a></li>"
+    <li><a href=\"package-watch?[export_vars -url {package_key return_url}]\">watch all files</a></li>
+<li><a href=\"package-watch-cancel?[export_vars -url {package_key return_url}]\">cancel all watches</a></li>"
 
     if { [empty_string_p $distribution_uri] } {
         doc_body_append "