Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.29.2.6 -r1.29.2.7
--- openacs-4/packages/file-storage/file-storage.info	9 Jun 2004 16:53:05 -0000	1.29.2.6
+++ openacs-4/packages/file-storage/file-storage.info	23 Jun 2004 00:56:25 -0000	1.29.2.7
@@ -18,6 +18,8 @@
         <requires url="acs-content-repository" version="5.1.0d1"/>
         <requires url="acs-kernel" version="5.1.0d1"/>
         <requires url="oacs-dav" version="0.2d"/>
+	<requires url="notifications" version="5.0.0b4"/>
+        <requires url="categories" version="1.0d4"/>
 
         <callbacks>
             <callback type="after-mount"  proc="fs::after_mount"/>
Index: openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql,v
diff -u -r1.7.4.3 -r1.7.4.4
--- openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql	25 May 2004 18:54:03 -0000	1.7.4.3
+++ openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql	23 Jun 2004 00:56:25 -0000	1.7.4.4
@@ -78,9 +78,10 @@
       case
         when cr_items.content_type = 'content_folder' then cr_folders.label
         when cr_items.content_type = 'content_extlink' then cr_extlinks.label
-        else nvl(cr_revisions.title,cr_items.name)
+        else cr_items.name
       end as name,
       cr_items.name as file_upload_name,
+      cr_revisions.title,
       acs_objects.last_modified,
       cr_extlinks.url,
       cr_items.parent_id,
Index: openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0d3-5.1.0d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0d3-5.1.0d4.sql,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0d3-5.1.0d4.sql	15 Jun 2004 18:37:58 -0000	1.1.2.3
+++ openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0d3-5.1.0d4.sql	23 Jun 2004 00:56:26 -0000	1.1.2.4
@@ -28,7 +28,7 @@
       case
         when cr_items.content_type = 'content_folder' then cr_folders.label
         when cr_items.content_type = 'content_extlink' then cr_extlinks.label
-        else nvl(cr_revisions.title,cr_items.name)
+        else cr_items.name
       end as name,
       cr_items.name as file_upload_name,
       acs_objects.last_modified,
Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql,v
diff -u -r1.8.4.2 -r1.8.4.3
--- openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql	25 May 2004 17:39:56 -0000	1.8.4.2
+++ openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql	23 Jun 2004 00:56:26 -0000	1.8.4.3
@@ -76,9 +76,10 @@
       case
         when cr_items.content_type = 'content_folder' then cr_folders.label
         when cr_items.content_type = 'content_extlink' then cr_extlinks.label
-        else coalesce(cr_revisions.title,cr_items.name)
+        else cr_items.name
       end as name,
       cr_items.name as file_upload_name,
+      cr_revisions.title,
       cr_revisions.mime_type,
       acs_objects.last_modified,
       cr_extlinks.url,
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql	25 May 2004 17:39:56 -0000	1.1.2.3
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql	23 Jun 2004 00:56:26 -0000	1.1.2.4
@@ -26,7 +26,7 @@
       case
         when cr_items.content_type = 'content_folder' then cr_folders.label
         when cr_items.content_type = 'content_extlink' then cr_extlinks.label
-        else coalesce(cr_revisions.title,cr_items.name)
+        else cr_items.name
       end as name,
       cr_items.name as file_upload_name,
       cr_revisions.mime_type,
Index: openacs-4/packages/file-storage/www/folder-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-chunk-oracle.xql,v
diff -u -r1.8.2.3 -r1.8.2.4
--- openacs-4/packages/file-storage/www/folder-chunk-oracle.xql	19 May 2004 19:46:06 -0000	1.8.2.3
+++ openacs-4/packages/file-storage/www/folder-chunk-oracle.xql	23 Jun 2004 00:56:26 -0000	1.8.2.4
@@ -15,6 +15,7 @@
                    fs_objects.url,
                    fs_objects.sort_key,
                    fs_objects.file_upload_name,
+                   fs_objects.title,
                    case
                      when :folder_path is null
                      then fs_objects.file_upload_name
Index: openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql,v
diff -u -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	19 May 2004 19:46:06 -0000	1.10.2.3
+++ openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	23 Jun 2004 00:56:26 -0000	1.10.2.4
@@ -16,6 +16,7 @@
                    fs_objects.url,
                    fs_objects.sort_key,
                    fs_objects.file_upload_name,
+                   fs_objects.title,
                    case
                      when :folder_path is null
                      then fs_objects.file_upload_name
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.21.2.13 -r1.21.2.14
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	1 Jun 2004 16:51:33 -0000	1.21.2.13
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	23 Jun 2004 00:56:26 -0000	1.21.2.14
@@ -84,7 +84,7 @@
 		       display_template {<a href="@contents.download_url@"><img src="@contents.icon@"  border=0 alt="#file-storage.@contents.pretty_type@#" /></a>}] \
 		  name \
 		  [list label [_ file-storage.Name] \
-		       display_template {<a href="@contents.file_url@">@contents.name@</a><br/><if @contents.name@ ne @contents.file_upload_name@><span style="color: \#999;">@contents.file_upload_name@</span></if>} \
+		       display_template {<a href="@contents.file_url@">@contents.name@</a><br/><if @contents.name@ ne @contents.title@><span style="color: \#999;">@contents.title@</span></if>} \
 		       orderby_desc {fs_objects.name desc} \
 		       orderby_asc {fs_objects.name asc}] \
 		  content_size_pretty \