Index: openacs-4/packages/dotlrn-research/www/research-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/www/Attic/research-admin-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-research/www/research-admin-portlet.adp	29 Mar 2002 19:22:48 -0000	1.5
+++ openacs-4/packages/dotlrn-research/www/research-admin-portlet.adp	20 Apr 2002 12:10:12 -0000	1.6
@@ -29,13 +29,11 @@
     <li>
       <img border="0" src="@files_to_add.url@graphics/file.gif" width="15" height="13">
       &nbsp;
-      @files_to_add.name@
+      <a href="@files_to_add.url@download/index?version_id=@files_to_add.live_revision@">
+        @files_to_add.name@
+      </a>
       &nbsp;
       <small>[&nbsp;
-        <a href="@files_to_add.url@download/index?version_id=@files_to_add.live_revision@">
-          download
-        </a>
-        &nbsp;|&nbsp;
         <a href="research-papers/add?file_id=@files_to_add.live_revision@">add to community</a>
       &nbsp;]</small>
   </li>  
@@ -52,13 +50,11 @@
     <li>
       <img border="0" src="@files_to_remove.url@graphics/file.gif" width="15" height="13">
       &nbsp;
-      @files_to_remove.name@
+      <a href="@files_to_remove.url@download/index?version_id=@files_to_remove.live_revision@">
+        @files_to_remove.name@
+      </a>
       &nbsp;
       <small>[&nbsp;
-        <a href="@files_to_remove.url@download/index?version_id=@files_to_remove.live_revision@">
-          download
-        </a>
-        &nbsp;|&nbsp;
         <a href="research-papers/remove?file_id=@files_to_remove.live_revision@">remove from community</a>
       &nbsp;]</small>
   </li>  
Index: openacs-4/packages/dotlrn-research/www/research-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/www/Attic/research-portlet.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-research/www/research-portlet.adp	29 Mar 2002 19:22:48 -0000	1.6
+++ openacs-4/packages/dotlrn-research/www/research-portlet.adp	20 Apr 2002 12:10:12 -0000	1.7
@@ -27,11 +27,15 @@
 <multiple name="files">
     <tr>
       <td width="5"><img border="0" src="@files.url@graphics/file.gif" width="15" height="13"></td>
-      <td><a href="@files.url@file?file_id=@files.file_id@">@files.name@</a></td>
       <td>
+        <a href="@files.url@download/index?version_id=@files.live_revision@">
+          @files.name@
+        </a>
+      </td>
+      <td>
         <small>[&nbsp;
-          <a href="@files.url@download/index?version_id=@files.live_revision@">
-            download
+          <a href="@files.url@file?file_id=@files.file_id@">
+            view details
           </a>
         &nbsp;]</small>
       </td>
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.6 -r1.7
--- openacs-4/packages/file-storage/www/folder-chunk.adp	4 Apr 2002 03:01:06 -0000	1.6
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	20 Apr 2002 12:10:11 -0000	1.7
@@ -31,7 +31,19 @@
 <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;]
+        <small>[&nbsp;
+<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>
+          &nbsp;]</small>
       </td>
       <td>&nbsp;</td>
       <td>@contents.type@</td>
@@ -40,18 +52,26 @@
 <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>
+        <a href="download/index?version_id=@contents.live_revision@">
+          @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;]
+        <small>[&nbsp;
+          <a href="file?file_id=@contents.object_id@">
+            view details
+          </a>
+        &nbsp;]</small>
       </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>
+    </tr>
 </multiple>
   </table>
 </if>
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.10 -r1.11
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	20 Apr 2002 11:26:20 -0000	1.10
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	20 Apr 2002 12:10:12 -0000	1.11
@@ -82,14 +82,17 @@
 </if>
 <else>
       <td>
-        <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 href="@folders.url@/download/@folders.name@?version_id=@folders.live_revision@">
+          <img border="0" src="@folders.url@graphics/file.gif" width="15" height="13">&nbsp;
+          @folders.name@
         </a>
       </td>
       <td><small>File</small></td>
       <td>
-        <a href="@folders.url@/download/@folders.name@?version_id=@folders.live_revision@">
-          <small>\[ download \]</small>
+        <a href="@folders.url@file?file_id=@folders.object_id@">
+          <small>[&nbsp;
+            view details
+          &nbsp;]</small>
         </a>
       </td>
 </else>