Index: openacs-4/packages/photo-album/www/photos-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-add.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/photos-add.tcl	29 Jun 2004 10:18:45 -0000	1.6
+++ openacs-4/packages/photo-album/www/photos-add.tcl	21 Mar 2005 15:36:50 -0000	1.7
@@ -27,23 +27,21 @@
 
 set photo_id [db_string get_next_object_id "select acs_object_id_seq.nextval from dual"]
 
-form create photos_upload -action photos-add-2 -html {enctype multipart/form-data}
+ad_form -name photos_upload -action photos-add-2 -html {enctype multipart/form-data} \
+    -export {album_id} -form {
+    {-section Either}
+    {upload_file:text(file),optional  {label {[_ photo-album._Choose_3]}}
+                                      {help_text {[_ photo-album._Use_1]}}
+    }
+    {-section Or}
+    {directory:text                   {html {size 50}}
+                                      {label {[_ photo-album.Upload_photos]}}
+                                      {help_text {[_ photo-album._the]}}
+                                      {value {[parameter::get -parameter FullTempPhotoDir -package_id [ad_conn package_id]]}}
+                                      {mode display}
+    }
+}
 
-element create photos_upload album_id  \
-  -label "album_id" -datatype integer -widget hidden
-
-form::section photos_upload Either
-
-element create photos_upload upload_file  \
-  -label "[_ photo-album._Choose_3]" -help_text "[_ photo-album._Use_1]" -datatype text -widget file -optional
-
-form::section photos_upload Or
-
-element create photos_upload directory -html { size 50} \
-    -label "Upload photos from the server directory" -help_text "[_ photo-album._the]" -datatype text -value "[parameter::get -parameter FullTempPhotoDir -package_id [ad_conn package_id]]" -widget text -mode display
-
-element set_properties photos_upload album_id -value $album_id
-
 ad_return_template