Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	16 Dec 2003 01:32:57 -0000	1.18
+++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	18 Jan 2004 14:19:42 -0000	1.19
@@ -60,7 +60,7 @@
   <msg key="lt_Live_version_of_title">Live version of &quot;%title%&quot;</msg>
   <msg key="lt_Modify_permissions_on">Modify permissions on this file</msg>
   <msg key="lt_Modify_permissions_on_1">Modify permissions on this folder</msg>
-  <msg key="lt_Please_enter_the_new_">Please enter the new name for this file:</msg>
+  <msg key="lt_Please_enter_the_new_">Please enter the new name for this file</msg>
   <msg key="lt_Select_the_folder_tha">Select the folder that you would like to copy &quot;%file_name%&quot; to</msg>
   <msg key="lt_Select_the_folder_tha_1">Select the folder that you would like to move &quot;%file_name%&quot; under</msg>
   <msg key="lt_Show_files_modified_i">Show files modified in the past</msg>
Index: openacs-4/packages/file-storage/www/file-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/file-edit.adp	13 Oct 2003 17:16:08 -0000	1.7
+++ openacs-4/packages/file-storage/www/file-edit.adp	18 Jan 2004 14:19:42 -0000	1.8
@@ -3,15 +3,5 @@
 <property name="header">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<form method=POST action=file-edit-2.tcl>
-<input type=hidden name="file_id" value="@file_id@">
+<formtemplate id="file-edit"></formtemplate>
 
-<p>#file-storage.lt_Please_enter_the_new_#
-
-<p><input type=text name="title" value="@title@" size=30>
-
-<p><input type=submit value="#file-storage.Change_Name#">
-
-</form>
-
-
Index: openacs-4/packages/file-storage/www/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file-edit.tcl	13 Oct 2003 17:16:08 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-edit.tcl	18 Jan 2004 14:19:42 -0000	1.6
@@ -33,4 +33,12 @@
 # Variable title used by message lookup
 set page_title [_ file-storage.file_edit_page_title]
 
+set title_help [_ file-storage.lt_Please_enter_the_new_]
+set submit_label [_ file-storage.Change_Name]
+
+ad_form -action file-edit-2 -export file_id -form {
+    {title:text(text) {help_text $title_help} {label \#file-storage.Name\#}}
+    {submit:text(submit) {label $submit_label}}
+} -has_submit 1
+
 ad_return_template
Index: openacs-4/packages/file-storage/www/simple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/file-storage/www/simple-add.adp	13 Oct 2003 17:16:08 -0000	1.8
+++ openacs-4/packages/file-storage/www/simple-add.adp	18 Jan 2004 14:19:42 -0000	1.9
@@ -2,40 +2,6 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<form method=POST action="simple-add-2">
-<input type=hidden name="folder_id" value="@folder_id@">
-<input type=hidden name="type" value="url">
+<formtemplate id="simple-add"></formtemplate>
 
-<table border=0>
 
-<tr>
-<td align=right> #file-storage.Title# </td>
-  <if @lock_title_p@ eq 0>
-    <td><input size=30 name=title value=@title@></td>
-  </if>
-  <else>
-     <td>@title@</td>
-     <input type=hidden name=title value=@title@>
-  </else>
-</tr>
-
-<tr>
-<td align=right> #file-storage.URL# </td>
-<td><input size=50 name=url value="http://"></td>
-</tr>
-
-<tr>
-<td valign=top align=right> #file-storage.Description# </td>
-<td colspan=2><textarea rows=5 cols=50 name=description wrap=soft></textarea></td>
-</tr>
-
-<tr>
-<td></td>
-<td><input type=submit value="#file-storage.Create#">
-</td>
-</tr>
-
-</table>
-</form>
-
-
Index: openacs-4/packages/file-storage/www/simple-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/file-storage/www/simple-add.tcl	13 Oct 2003 17:16:08 -0000	1.9
+++ openacs-4/packages/file-storage/www/simple-add.tcl	18 Jan 2004 14:19:42 -0000	1.10
@@ -44,3 +44,27 @@
 
 # Message lookup uses variable pretty_name
 set page_title [_ file-storage.simple_add_page_title]
+
+
+ad_form -action simple-add-2 -export {folder_id type} -form {
+    {dummy:text(hidden)}
+} -has_submit 1
+
+if {$lock_title_p} {
+    ad_form -extend -form {
+        {title_display:text(inform) {label \#file-storage.Title\#} }
+        {title:text(hidden) {value $title}}
+    }
+} else {
+    ad_form -extend -form {
+        {title:text {label \#file-storage.Title\#} {html {size 30}} }
+    }
+}
+
+set submit_label [_ file-storage.Create]
+
+ad_form -extend -form {
+    {url:text(text) {label \#file-storage.URL\#} {value "http://"}}
+    {description:text(textarea),optional {html {rows 5 cols 50}} {label \#file-storage.Description\#}}
+    {submit:text(submit) {label $submit_label}}
+}
Index: openacs-4/packages/file-storage/www/version-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/version-add.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/version-add.adp	13 Oct 2003 17:16:08 -0000	1.7
+++ openacs-4/packages/file-storage/www/version-add.adp	18 Jan 2004 14:19:42 -0000	1.8
@@ -2,36 +2,4 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<form enctype=multipart/form-data method=POST action=version-add-2>
-<input type=hidden name=file_id value="@file_id@">
-<input type=hidden name="title" value="@title@">
-<table border=0>
-
-<tr>
-<td align=right>#file-storage.Version_filename_1#</td>
-<td><input type=file name=upload_file size=20></td>
-</tr>
-
-<tr>
-<td>&nbsp;</td>
-<td><font size=-1>#file-storage.lt_Use_the_Browse_button# </font></td>
-</tr>
-
-<tr>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-</tr>
-
-<tr>
-<td valign=top align=right> #file-storage.Version_Notes_1# </td>
-<td colspan=2><textarea rows=5 cols=50 name=description wrap=physical></textarea></td>
-</tr>
-
-<tr>
-<td></td>
-<td><input type=submit value="#file-storage.Update#">
-</td>
-</tr>
-
-</table>
-</form>
+<formtemplate id="version-add"></formtemplate>
Index: openacs-4/packages/file-storage/www/version-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/version-add.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/version-add.tcl	13 Oct 2003 17:16:08 -0000	1.5
+++ openacs-4/packages/file-storage/www/version-add.tcl	18 Jan 2004 14:19:42 -0000	1.6
@@ -36,4 +36,12 @@
 # Message lookup uses variable title
 set page_title [_ file-storage.version_add_page_title]
 
+set upload_file_help [_ file-storage.lt_Use_the_Browse_button]
+set submit_label [_ file-storage.Update]
+ad_form -html { enctype multipart/form-data } -export { file_id title } -action version-add-2 -form {
+    {upload_file:file {label \#file-storage.Version_filename_1\#} {help_text $upload_file_help}}
+    {description:text(textarea),optional {html {rows 5 cols 50}} {label \#file-storage.Version_Notes_1\#}}
+    {submit:text(submit) {label $submit_label}}
+} -has_submit 1
+
 ad_return_template