Index: openacs-4/packages/dotlrn/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/folder-chunk.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/folder-chunk.adp	29 Mar 2002 19:14:46 -0000	1.3
+++ openacs-4/packages/dotlrn/www/folder-chunk.adp	4 Apr 2002 03:01:45 -0000	1.4
@@ -24,28 +24,53 @@
       <td>&nbsp;</td>
       <td>Name</td>
       <td>Action</td>
-      <td>Size (bytes)</td>
+      <td>Size</td>
       <td>Type</td>
       <td>Last Modified</td>
     </tr>
 <multiple name="contents">
     <tr>
 <if @contents.type@ eq "Folder">
-      <td><img src="file-storage/graphics/folder.gif"></td>
-      <td><a href="file-storage/index?folder_id=@contents.file_id@">@contents.name@</a></td>
+      <td><img src="graphics/folder.gif"></td>
+      <td>
+        <a href="index?folder_id=@contents.object_id@&n_past_days=@n_past_days@">@contents.name@</a>
+<if @contents.new_p@ and @contents.content_size@ gt 0>(&nbsp;new&nbsp;)</if>
+      </td>
       <td>&nbsp;</td>
+      <td>
+        @contents.content_size@ item<if @contents.content_size@ ne 1>s</if>
+      </td>
+      <td>@contents.type@</td>
+      <td>@contents.last_modified@</td>
+</if>
+<else>
+<if @contents.type@ eq "URL">
+      <td><img src="graphics/file.gif"></td>
+      <td>
+      <a href="url-goto?url_id=@contents.object_id@">@contents.name@</a>
+<if @contents.new_p@>(&nbsp;new&nbsp;)</if>
+      </td>
+      <td>
+        [&nbsp;<small><if @contents.write_p@ or @contents.admin_p@><a href="simple-edit?object_id=@contents.object_id@">edit</a></if><if @contents.delete_p@ or @contents.admin_p@>&nbsp;|&nbsp;<a href="simple-delete?folder_id=@folder_id@&object_id=@contents.object_id@">delete</a></if></small>&nbsp;]
+      </td>
       <td>&nbsp;</td>
-      <td>Folder</td>
-      <td>&nbsp;</td>
+      <td>@contents.type@</td>
+      <td>@contents.last_modified@</td>
 </if>
 <else>
-      <td><img src="file-storage/graphics/file.gif"></td>
-      <td><a href="file-storage/file?file_id=@contents.file_id@">@contents.name@</a></td>
-      <td><a href="file-storage/download/index?version_id=@contents.live_revision@">(download)</a></td>
-      <td>@contents.content_size@</td>
+      <td><img src="graphics/file.gif"></td>
+      <td>
+      <a href="file?file_id=@contents.object_id@">@contents.name@</a>
+<if @contents.new_p@>(&nbsp;new&nbsp;)</if>
+      </td>
+      <td>
+        [&nbsp;<small><a href="download/index?version_id=@contents.live_revision@">download</a><if @contents.delete_p@ or @contents.admin_p@>&nbsp;|&nbsp;<a href="file-delete?file_id=@contents.object_id@">delete</a></if></small>&nbsp;]
+      </td>
+      <td>@contents.content_size@ byte<if @contents.content_size@ ne 1>s</if></td>
       <td>@contents.type@</td>
       <td>@contents.last_modified@</td>
 </else>
+</else>
   </tr>
 </multiple>
   </table>
Index: openacs-4/packages/dotlrn/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/folder-chunk.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/folder-chunk.tcl	29 Mar 2002 19:14:46 -0000	1.4
+++ openacs-4/packages/dotlrn/www/folder-chunk.tcl	4 Apr 2002 03:01:45 -0000	1.5
@@ -35,10 +35,17 @@
     set viewing_user_id [acs_magic_object "the_public"]
 }
 
+if {![exists_and_not_null n_past_days]} {
+    set n_past_days -1
+}
+
 set folder_name [fs_get_folder_name $folder_id]
 
-template::util::list_of_ns_sets_to_multirow \
-    -rows [fs::get_folder_contents -folder_id $folder_id -user_id $viewing_user_id] \
-    -var_name "contents"
+set rows [fs::get_folder_contents \
+    -folder_id $folder_id \
+    -user_id $viewing_user_id \
+    -n_past_days $n_past_days \
+]
+template::util::list_of_ns_sets_to_multirow -rows $rows -var_name "contents"
 
 ad_return_template
Index: openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	29 Mar 2002 19:41:28 -0000	1.5
+++ openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	4 Apr 2002 03:01:52 -0000	1.6
@@ -5,16 +5,16 @@
 
     <fullquery name="select_files_and_folders">
         <querytext>
-            select fs_folders_and_files.file_id,
-                   fs_folders_and_files.name,
-                   fs_folders_and_files.live_revision,
-                   fs_folders_and_files.type,
-                   fs_folders_and_files.content_size
-            from fs_folders_and_files
-            where fs_folders_and_files.file_id = :my_folder_id
-            and 't' = acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'read')
-            order by fs_folders_and_files.sort_key,
-                     fs_folders_and_files.name
+            select fs_objects.object_id,
+                   fs_objects.name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.content_size
+            from fs_objects
+            where fs_objects.object_id = :my_folder_id
+            and 't' = acs_permission.permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.sort_key,
+                     fs_objects.name
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	29 Mar 2002 19:25:48 -0000	1.6
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	4 Apr 2002 03:01:52 -0000	1.7
@@ -24,7 +24,7 @@
     <tr>
 <if @folders.type@ eq "Folder">
       <td>
-        <a href="@folders.url@?folder_id=@folders.file_id@">
+        <a href="@folders.url@?folder_id=@folders.object_id@">
           <img border="0" src="@folders.url@graphics/folder.gif" width="15" height="13">&nbsp;@folders.name@
         </a>
       </td>
@@ -43,7 +43,7 @@
 </if>
 <else>
       <td>
-        <a href="@folders.url@file?file_id=@folders.file_id@">
+        <a href="@folders.url@file?file_id=@folders.object_id@">
           <img border="0" src="@folders.url@graphics/file.gif" width="15" height="13">&nbsp;@folders.name@
         </a>
       </td>