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.10 -r1.11
--- openacs-4/packages/photo-album/photo-album.info 11 Dec 2003 21:40:10 -0000 1.10
+++ openacs-4/packages/photo-album/photo-album.info 29 Apr 2004 15:23:04 -0000 1.11
@@ -7,7 +7,7 @@
f
f
-
+
Jeff Davis
Walter McGinnis
Tom Baginski
@@ -24,9 +24,9 @@
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.8 -r1.9
--- openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml 9 Mar 2004 18:02:55 -0000 1.8
+++ openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml 29 Apr 2004 15:23:04 -0000 1.9
@@ -19,8 +19,8 @@
Edit Album Attributes
Edit Folder Attributes
Edit Photo Attributes
- Edit page $page
- Edit page $page
+ 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\">
return to the directory listing</a> to see if your album is there.
@@ -32,7 +32,7 @@
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
- For show this photo <a href=photo-edit?photo_id=$photo_id>edit the attributes</a> an uncheck the option hide
+ To show this photo <a href=photo-edit?photo_id=%photo_id%>edit the attributes</a> and uncheck the hide option
Full Size Image
Hide the image html source
Modify this package's parameters
@@ -56,19 +56,19 @@
The specified album is not valid.
The parameter AcceptableUploadMIMETypes is not satisfied
The parameter ConverttoJpgorPng is not in automatic mode
- This photo couldn't be showed because :
+ 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\"
We got an error that we couldn't readily identify. Please let the system owner know about this.
- <pre>$errmsg</pre>
+ <pre>%errmsg%</pre>
We got an error that we couldn't readily identify. Please let the system owner know about this.
Yes, Delete It
You must provide a non-empty name for the clipboard
You may not delete the root folder.
You may not move the root folder.
- You can click <a href=album?album_id=$old_album_id> here </a> to view all photos of the album
+ You can click <a href=album?album_id=%old_album_id%> here </a> to view all photos of the album
Add a new album
Add a new folder
Album Name
Index: openacs-4/packages/photo-album/sql/oracle/photo-album-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/oracle/photo-album-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/sql/oracle/photo-album-create.sql 20 Nov 2003 13:03:54 -0000 1.3
+++ openacs-4/packages/photo-album/sql/oracle/photo-album-create.sql 29 Apr 2004 15:23:05 -0000 1.4
@@ -287,14 +287,15 @@
package_id constraint pa_pack_fldr_map_pk
primary key
constraint pa_pack_fldr_map_pack_id_fk
- references apm_packages,
+ references apm_packages on delete cascade,
folder_id constraint pa_pack_fldr_map_fldr_id_fk
- references cr_folders
+ references cr_folders on delete cascade
constraint pa_pack_fldr_map_fldr_id_unq
unique
);
-create index pa_package_folder_map_by_pack on pa_package_root_folder_map (package_id, folder_id);
+--There cannot be much if any benefit from this index.
+--create index pa_package_folder_map_by_pack on pa_package_root_folder_map (package_id, folder_id);
comment on table pa_package_root_folder_map is '
Table to keep track of root folder for each instance of the photo-album
Index: openacs-4/packages/photo-album/sql/oracle/upgrade/upgrade-5.2.0d1-5.2.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/oracle/upgrade/upgrade-5.2.0d1-5.2.0d2.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/photo-album/sql/oracle/upgrade/upgrade-5.2.0d1-5.2.0d2.sql 29 Apr 2004 15:23:05 -0000 1.1
@@ -0,0 +1,11 @@
+-- add cascade to the foreign key constraints
+-- @author Jeff Davis (davis@xarg.net)
+-- @cvs-id $id$
+
+alter table pa_package_root_folder_map drop constraint pa_pack_fldr_map_pack_id_fk;
+alter table pa_package_root_folder_map add constraint pa_pack_fldr_map_pack_id_fk
+ foreign key (package_id) references apm_packages on delete cascade;
+
+alter table pa_package_root_folder_map drop constraint pa_pack_fldr_map_fldr_id_fk;
+alter table pa_package_root_folder_map add constraint pa_pack_fldr_map_fldr_id_fk
+ foreign key (folder_id) references cr_folders on delete cascade;
Index: openacs-4/packages/photo-album/sql/postgresql/photo-album-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/postgresql/photo-album-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/sql/postgresql/photo-album-create.sql 20 Nov 2003 13:03:54 -0000 1.3
+++ openacs-4/packages/photo-album/sql/postgresql/photo-album-create.sql 29 Apr 2004 15:23:05 -0000 1.4
@@ -307,16 +307,18 @@
constraint pa_pack_fldr_map_pk
primary key
constraint pa_pack_fldr_map_pack_id_fk
- references apm_packages,
+ references apm_packages on delete cascade,
folder_id integer
constraint pa_pack_fldr_map_fldr_id_fk
- references cr_folders
+ references cr_folders on delete cascade
constraint pa_pack_fldr_map_fldr_id_unq
unique
);
-create index pa_package_folder_map_by_pack on pa_package_root_folder_map (package_id, folder_id);
+--There cannot be much if any benefit from this index.
+--create index pa_package_folder_map_by_pack on pa_package_root_folder_map (package_id, folder_id);
+
comment on table pa_package_root_folder_map is '
Table to keep track of root folder for each instance of the photo-album
Used for sub-site support. Each instance of the photo album has a unique
Index: openacs-4/packages/photo-album/sql/postgresql/upgrade/upgrade-5.2.0d1-5.2.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/postgresql/upgrade/upgrade-5.2.0d1-5.2.0d2.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/photo-album/sql/postgresql/upgrade/upgrade-5.2.0d1-5.2.0d2.sql 29 Apr 2004 15:23:05 -0000 1.1
@@ -0,0 +1,11 @@
+-- add cascade to the foreign key constraints
+-- @author Jeff Davis (davis@xarg.net)
+-- @cvs-id $id$
+
+alter table pa_package_root_folder_map drop constraint pa_pack_fldr_map_pack_id_fk;
+alter table pa_package_root_folder_map add constraint pa_pack_fldr_map_pack_id_fk
+ foreign key (package_id) references apm_packages on delete cascade;
+
+alter table pa_package_root_folder_map drop constraint pa_pack_fldr_map_fldr_id_fk;
+alter table pa_package_root_folder_map add constraint pa_pack_fldr_map_fldr_id_fk
+ foreign key (folder_id) references cr_folders on delete cascade;
Index: openacs-4/packages/photo-album/www/folder-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/folder-edit.tcl 18 Nov 2003 22:59:03 -0000 1.4
+++ openacs-4/packages/photo-album/www/folder-edit.tcl 29 Apr 2004 15:23:06 -0000 1.5
@@ -30,10 +30,10 @@
-datatype integer -widget hidden
template::element create folder_edit label -html { size 30 } \
- -label "<_#Folder Name#>" -datatype text
+ -label [_ photo-album._Folder] -datatype text
template::element create folder_edit description -html { size 50 } \
- -label "<_#Folder Description#>" -optional -datatype text
+ -label [_ photo-album._Folder_1] -optional -datatype text
set title [pa_get_folder_name $folder_id]