Index: openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml	29 Jun 2004 10:18:44 -0000	1.11
+++ openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml	21 Mar 2005 15:36:50 -0000	1.12
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="photo-album" package_version="5.0d1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="photo-album" package_version="5.2.2" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_Album">Album Description</msg>
   <msg key="_Album_1">Album Story</msg>
@@ -95,9 +95,9 @@
   <msg key="Hide">Hide</msg>
   <msg key="Hide_1">Hide:</msg>
   <msg key="hide_html">Hide the html source code of the image</msg>
-  <msg key="log_in">log in</msg>
   <msg key="image_only">Image only: </msg>
   <msg key="image_with_link">Image with link: </msg>
+  <msg key="log_in">log in</msg>
   <msg key="lt_Add_a_collection_of_p">Add a collection of photos to this album</msg>
   <msg key="lt_Add_a_single_photo_to">Add a single photo to this album</msg>
   <msg key="lt_and_add_them_to_a_cli">and add them to a clipboard to use 
@@ -176,10 +176,11 @@
   <msg key="Story_1">Story:</msg>
   <msg key="Story_story">Story: %story%</msg>
   <msg key="Submit">Submit</msg>
+  <msg key="thumbnail_with_link">Thumbnail with link:</msg>
   <msg key="Title">Title</msg>
   <msg key="Title_1">Title:</msg>
-  <msg key="thumbnail_with_link">Thumbnail with link:</msg>
   <msg key="Upload_a_Photo">Upload a Photo</msg>
+  <msg key="Upload_photos">Upload photos from the server directory</msg>
   <msg key="You_will_have_to">You will have to</msg>
   <msg key="Your_clipboards">Your clipboards</msg>
 </message_catalog>
Index: openacs-4/packages/photo-album/www/photo-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/photo-add-2.tcl	13 Jan 2005 13:58:36 -0000	1.5
+++ openacs-4/packages/photo-album/www/photo-add-2.tcl	21 Mar 2005 15:36:50 -0000	1.6
@@ -1,4 +1,5 @@
 # /packages/photo-album/www/photo-add-2.tcl
+ns_log Notice "Huh? here we are..."
 
 ad_page_contract {
     adds a photo to an album
Index: openacs-4/packages/photo-album/www/photos-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-add-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/photos-add-2.tcl	26 Jan 2004 15:39:48 -0000	1.6
+++ openacs-4/packages/photo-album/www/photos-add-2.tcl	21 Mar 2005 15:36:50 -0000	1.7
@@ -29,6 +29,7 @@
     }
 } 
 
+ns_log Notice "Huh? in photo-add-2..."
 #check permission
 set user_id [ad_conn user_id]
 ad_require_permission $album_id "pa_create_photo"
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