+
+
+
+
+
+ |
+ Image |
+
+
+ |
+
+
+
+
+ |
+
+ |
+
+
+
+
+
Index: openacs-4/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.tcl,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/project-manager/www/one.tcl 2 Dec 2005 20:02:41 -0000 1.3.2.1
+++ openacs-4/packages/project-manager/www/one.tcl 31 Jan 2006 03:10:54 -0000 1.3.2.2
@@ -502,6 +502,19 @@
# end of customizations
+db_1row get_photo ""
+set photo_album_url [parameter::get -parameter "PhotoAlbumURL" -default ""]
+if { [string length $photo_album_url] > 0 && [string length $album_id] > 0 && [string length $image_id] > 0 } {
+ set use_image_p "t"
+ photo_album::photo::get -photo_id $image_id -array photo_info
+ set thumb_path $photo_info(thumb_image_id)
+ set thumb_height $photo_info(thumb_height)
+ set thumb_width $photo_info(thumb_width)
+ set thumb_image_url $photo_album_url/images/$photo_info(thumb_image_id)
+ set viewer_image_url $photo_album_url/images/$photo_info(viewer_image_id)
+} else {
+ set use_image_p "f"
+}
ad_return_template
# ------------------------- END OF FILE ------------------------- #
Index: openacs-4/packages/project-manager/www/one.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one.xql,v
diff -u -N -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/project-manager/www/one.xql 30 Nov 2005 06:47:37 -0000 1.3.2.2
+++ openacs-4/packages/project-manager/www/one.xql 31 Jan 2006 03:10:54 -0000 1.3.2.3
@@ -165,4 +165,12 @@
+
+
+ select album_id, image_id
+ from pm_projectsx
+ where project_id = :original_project_id
+
+
+
Index: openacs-4/packages/project-manager/www/admin/logger.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/logger.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/project-manager/www/admin/logger.tcl 30 Apr 2005 06:59:34 -0000 1.2
+++ openacs-4/packages/project-manager/www/admin/logger.tcl 31 Jan 2006 03:10:54 -0000 1.2.2.1
@@ -40,9 +40,13 @@
set value ""
}
+ # having forward slashes in the item name terminally confuses
+ # the form builder.
+ regsub -all {/} $url "" cleaned_url
+
append logger_definition "
- {package_url_$url:text(checkbox),optional
+ {package_url_$cleaned_url:text(checkbox),optional
{label \"$url\"}
{options {{\"\" \"t\"}}}
{value $value}
@@ -65,7 +69,11 @@
set urls_list [list]
foreach url $possible_URLs {
- set this_value "[set package_url_[set url]]"
+ # having forward slashes in the item name terminally confuses
+ # the form builder.
+ regsub -all {/} $url "" cleaned_url
+
+ set this_value "[set package_url_[set cleaned_url]]"
if {[string equal t $this_value]} {
lappend urls_list $url
}
| |