Index: openacs-4/packages/photo-album/photo-album.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/photo-album.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/photo-album/photo-album.info 29 Apr 2004 15:23:04 -0000 1.11 +++ openacs-4/packages/photo-album/photo-album.info 3 May 2004 13:13:54 -0000 1.12 @@ -7,12 +7,12 @@ f f - + Jeff Davis Walter McGinnis Tom Baginski Organization, editing and display of user uploaded photos. - 2003-09-26 + 2004-05-03 OpenACS A photo album application that provides photo display and grouping functionality using the ACS Content Repository. @@ -24,7 +24,7 @@ for details. - + 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.9 -r1.10 --- openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml 29 Apr 2004 15:23:04 -0000 1.9 +++ openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml 3 May 2004 13:13:55 -0000 1.10 @@ -21,15 +21,15 @@ Edit Photo Attributes Edit page %page% Edit page %page% - Either there is already an album with the name \"$name\" - or you clicked on the button more than once. You can <a href=\"index?parent_id=$parent_id\"> + Either there is already an album with the name "$name" + or you clicked on the button more than once. You can <a href="index?parent_id=$parent_id"> return to the directory listing</a> to see if your album is there. - Either there is already an album in the specified folder with the name \"$folder_name\" or you clicked on the button more than once. You can <a href=\"?folder_id=$new_folder_id\">return to the new folder</a> to see if your album is there. - Either there is already a folder with the name \"$name\" - or you clicked on the button more than once. You can <a href=\"index?parent_id=$parent_id\"> + Either there is already an album in the specified folder with the name "$folder_name" or you clicked on the button more than once. You can <a href="?folder_id=$new_folder_id">return to the new folder</a> to see if your album is there. + Either there is already a folder with the name "$name" + or you clicked on the button more than once. You can <a href="index?parent_id=$parent_id"> return to the directory listing</a> to see if your folder is there. - Either there is already an folder in the specified folder with the name \"$folder_name\" or you clicked on the button more than once. You can <a href=\"?folder_id=$new_folder_id\">return to the new folder</a> to see if your folder is there. - Either there is already a photo in the specified album with the name \"$filename\" or you clicked on the button more than once. You can <a href=\"album?album_id=$new_album_id\">return to the new album</a> to see if your photo is there. + Either there is already an folder in the specified folder with the name "$folder_name" or you clicked on the button more than once. You can <a href="?folder_id=$new_folder_id">return to the new folder</a> to see if your folder is there. + Either there is already a photo in the specified album with the name "$filename" or you clicked on the button more than once. You can <a href="album?album_id=$new_album_id">return to the new album</a> to see if your photo is there. Folder Name Folder Description To show this photo <a href=photo-edit?photo_id=%photo_id%>edit the attributes</a> and uncheck the hide option @@ -58,8 +58,8 @@ The parameter ConverttoJpgorPng is not in automatic mode This photo couldn't be shown because : Upload photos - Use the \"Browse...\" button find a file - Use the \"Browse...\" button to locate your file, then click \"Open\" + Use the "Browse..." button find a file + Use the "Browse..." button to locate your file, then click "Open" We got an error that we couldn't readily identify. Please let the system owner know about this. <pre>%errmsg%</pre> @@ -94,7 +94,10 @@ Flash Hide Hide: + Hide the html source code of the image log in + Image only: + Image with link: Add a collection of photos to this album Add a single photo to this album and add them to a clipboard to use @@ -166,6 +169,7 @@ remove screen. Sequence: + Show the html source code of the image for copy and paste shutterfly.com Smaller&nbsp;image Story @@ -174,6 +178,7 @@ Submit Title Title: + Thumbnail with link: Upload a Photo You will have to Your clipboards Index: openacs-4/packages/photo-album/www/photo.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/photo-album/www/photo.adp 20 Apr 2004 21:13:53 -0000 1.6 +++ openacs-4/packages/photo-album/www/photo.adp 3 May 2004 13:13:56 -0000 1.7 @@ -12,11 +12,14 @@ @title@ -
- <img src="@system_url@@node_url@images/@path@/@title@" height="@height@" width="@width@" alt="@title@"/> -
+
    +
  • #photo-album.thumbnail_with_link# <a href="@photo_base_url@photo?photo_id=@photo_id@"><img src="@photo_base_url@images/@thumb_image_id@" height="@thumb_height@" width="@thumb_width@" alt="@caption@" /></a> + +
  • #photo-album.image_only# <img src="/images/@path@/@title@" height="@height@" width="@width@" alt="@title@"/> + +
  • #photo-album.image_with_link# <a href="@photo_base_url@photo?photo_id=@photo_id@"><img src="/images/@path@/@title@" height="@height@" width="@width@" alt="@title@"/></a> +
-

@caption@

 @@ -29,10 +32,10 @@
    -
  • Hide the html source code of the image
    • +
  • #photo-album.hide_html#
    •  -
  • Show the html source code of the image for copy&paste
    • +
  • #photo-album.show_html#
    •
  • #photo-album.lt_Make_this_photo_the_i# Index: openacs-4/packages/photo-album/www/photo.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/photo-album/www/photo.tcl 20 Apr 2004 21:13:53 -0000 1.7 +++ openacs-4/packages/photo-album/www/photo.tcl 3 May 2004 13:13:56 -0000 1.8 @@ -43,14 +43,15 @@ set user_id [ad_conn user_id] set context [pa_context_bar_list $photo_id] set root_folder_id [pa_get_root_folder] +set package_id [ad_conn package_id] +set photo_base_url [site_node::get_url_from_object_id -object_id $package_id] set system_url [ad_url] set node_url [site_node::get_url -node_id [ad_conn node_id]] # to move a photo need write on photo, and old parent album # and pa_create_photo on new parent album (which is check in the is_valid block) - set old_album_id [db_string get_parent_album {}] set write_p [permission::permission_p -object_id $photo_id \ @@ -84,9 +85,21 @@
  • [_ photo-album._For]
  • [_ photo-album._Your]
" +} else { + set thumb_image_id "" + set thumb_photo_id "" + set thumb_height "" + set thumb_width "" + if {$show_html_p} { + # if we did get a photo, and we need html source, get some info about the thumbnail + db_0or1row get_thumbnail_info { *SQL* } + } } + + + set path $image_id # to move a photo need write on photo and write on parent album @@ -145,7 +158,7 @@ if [db_string duplicate_check {}] { ad_return_complaint 1 "[_ photo-album._Either_4]" } else { - ad_return_complaint 1 "[_ photo-album._We_1]" + ad_return_complaint 1 "[_ photo-album._We_1] 
$errmsg
" } Index: openacs-4/packages/photo-album/www/photo.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/photo-album/www/photo.xql 18 Nov 2003 18:36:21 -0000 1.3 +++ openacs-4/packages/photo-album/www/photo.xql 3 May 2004 13:13:56 -0000 1.4 @@ -93,4 +93,23 @@ + + + select ci.item_id as thumb_photo_id, + i.image_id as thumb_image_id, + i.height as thumb_height, + i.width as thumb_width + from cr_items ci, + cr_items ci2, + cr_child_rels ccr2, + images i + where ccr2.relation_tag = 'thumb' + and ci.item_id = ccr2.parent_id + and ccr2.child_id = ci2.item_id + and ci2.live_revision = i.image_id + and ci.live_revision is not null + and ci.item_id = :photo_id + + +