Index: openacs-4/packages/file-storage/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/folder-chunk.adp	2 Apr 2002 15:25:37 -0000	1.5
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	4 Apr 2002 03:01:06 -0000	1.6
@@ -13,28 +13,44 @@
 <if @contents.type@ eq "Folder">
       <td><img src="graphics/folder.gif"></td>
       <td>
-        <a href="index?folder_id=@contents.file_id@">@contents.name@</a>
-<if @contents.new_p@>( new )</if>
+        <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>Folder</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>
-      <if @contents.versioned_p@ eq t><a href="file?file_id=@contents.file_id@">@contents.name@</a></if><else>@contents.name@</else>
-<if @contents.new_p@>( new )</if>
+      <a href="url-goto?url_id=@contents.object_id@">@contents.name@</a>
+<if @contents.new_p@>(&nbsp;new&nbsp;)</if>
       </td>
       <td>
-        [<small><if @contents.url_p@ eq t><a href=url-goto?url_id=@contents.file_id@>go to</a><if @contents.write_p@ eq 1>&nbsp;|&nbsp;<a href="simple-edit?object_id=@contents.file_id@">edit</a></if></if><else><a href="download/index?version_id=@contents.live_revision@">download</a></else><if @contents.delete_p@ eq 1 or @contents.admin_p@ eq 1>&nbsp;|&nbsp;<a href="<if @contents.versioned_p@ eq t>file-delete?file_id=@contents.file_id@</if><else>simple-delete?folder_id=@folder_id@&object_id=@contents.file_id@</else>">delete</a></if>]</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>@contents.type@</td>
+      <td>@contents.last_modified@</td>
+</if>
+<else>
+      <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>