Index: openacs-4/packages/file-storage/www/file-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-copy.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/file-copy.adp	13 Oct 2003 17:16:08 -0000	1.7
+++ openacs-4/packages/file-storage/www/file-copy.adp	19 Jan 2004 14:43:40 -0000	1.8
@@ -4,13 +4,7 @@
 
 <P>#file-storage.lt_Select_the_folder_tha#
 
-<form method=GET action="file-copy-2">
-<input type=hidden name=file_id value="@file_id@">
+<include src="folder-list" file_id="@file_id@" base_url="file-copy-2">
 
-<include src="folder-list" file_id="">
-<p>
-<input type=submit value="#file-storage.Copy#">
-</form>
 
 
-
Index: openacs-4/packages/file-storage/www/file-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/file-move.adp	13 Oct 2003 17:16:08 -0000	1.7
+++ openacs-4/packages/file-storage/www/file-move.adp	19 Jan 2004 14:43:40 -0000	1.8
@@ -4,13 +4,7 @@
 
 <P>#file-storage.lt_Select_the_folder_tha_1#
 
-<form method=GET action="file-move-2">
-<input type=hidden name=file_id value="@file_id@">
+<include src="folder-list" file_id="@file_id;noquote@" base_url="file-move-2">
 
-<include src="folder-list" file_id="@file_id;noquote@">
-<p>
-<input type=submit value="#file-storage.Move#">
-</form>
 
 
-
Index: openacs-4/packages/file-storage/www/folder-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-list.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/folder-list.adp	22 May 2003 14:55:53 -0000	1.3
+++ openacs-4/packages/file-storage/www/folder-list.adp	19 Jan 2004 14:43:40 -0000	1.4
@@ -1,11 +1,6 @@
-<if @folder:rowcount@ gt 8>
-<select name="parent_id" size=8>
-</if><else>
-<select name="parent_id" size=@folder:rowcount@>
-</else>
+<p>
 <multiple name="folder">
-<option value="@folder.new_parent@">@folder.spaces;noquote@ @folder.label@</option>
+    @folder.spaces;noquote@ <a href="@folder.link_url@">@folder.label@</a><br/>
 </multiple>
-</select>
+</p>
 
-
Index: openacs-4/packages/file-storage/www/folder-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/folder-list.tcl	5 Nov 2002 17:19:59 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-list.tcl	19 Jan 2004 14:43:40 -0000	1.3
@@ -1,7 +1,7 @@
 set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
 
-if ![empty_string_p $file_id] {
+if [string equal $base_url file-move-2] {
     set children_clause [db_map children_clause]
 } else {
     set children_clause ""
@@ -21,4 +21,6 @@
  connect by prior item_id = parent_id
  start with item_id = file_storage.get_root_folder(:package_id)
 "
-db_multirow folder folder $sql
+db_multirow -extend link_url folder folder $sql { set link_url [export_vars -base $base_url {file_id {parent_id $new_parent}}] }
+
+
Index: openacs-4/packages/file-storage/www/version-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/version-delete.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/version-delete.adp	13 Oct 2003 17:16:08 -0000	1.7
+++ openacs-4/packages/file-storage/www/version-delete.adp	19 Jan 2004 14:43:40 -0000	1.8
@@ -2,14 +2,5 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<form method=POST action=version-delete>
-<input type=hidden name=version_id value=@version_id@>
-<input type=hidden name=confirmed_p value="t">
+<formtemplate id="version-delete"></formtemplate>
 
-<p>#file-storage.lt_Are_you_sure_that_you#
-<p>
-<center>
-<input type=submit value="#file-storage.Yes_Delete_It#">
-</center>
-
-</form>
Index: openacs-4/packages/file-storage/www/version-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/version-delete.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/file-storage/www/version-delete.tcl	13 Oct 2003 17:16:08 -0000	1.8
+++ openacs-4/packages/file-storage/www/version-delete.tcl	19 Jan 2004 14:43:40 -0000	1.9
@@ -29,9 +29,19 @@
 from   cr_revisions
 where  revision_id = :version_id"
 
-if {[string equal $confirmed_p "t"]} {
-    # they have confirmed that they want to delete the version
+db_1row version_name "
+    select i.name as title,r.title as version_name 
+    from cr_items i,cr_revisions r
+    where i.item_id = r.item_id
+    and revision_id = :version_id"
 
+set context [fs_context_bar_list -final [_ file-storage.Delete_Version] $item_id]
+
+set delete_message [_ file-storage.lt_Are_you_sure_that_you]
+ad_form -export version_id -cancel_url "file?[export_vars {{file_id $item_id}}]" -form {
+    {delete_message:text(inform) {label $delete_message}}
+} -on_submit {
+
     set parent_id [db_exec_plsql delete_version "
          begin
 
@@ -60,16 +70,6 @@
          ad_script_abort
     }
 
-} else {
-    # they still need to confirm
-
-    db_1row version_name "
-    select i.name as title,r.title as version_name 
-    from cr_items i,cr_revisions r
-    where i.item_id = r.item_id
-    and revision_id = :version_id"
-
-    set context [fs_context_bar_list -final [_ file-storage.Delete_Version] $item_id]
 }
 
 # Message lookup uses variable version_name