Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	4 Jun 2002 15:44:47 -0000	1.3
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	4 Jun 2002 16:34:12 -0000	1.4
@@ -18,66 +18,59 @@
 
 %>
 
-  <if @folders:rowcount@ eq 0>
-    <small>Folder is empty</small>
-  </if>
-  <else>
+    <table border="0" cellpadding="2" cellspacing="2" width="100%">
 
-    <table border="0" cellpadding="2" cellspacing="2" width="100%">    
+<multiple name="folders">
 
-    <multiple name="folders">
+      <tr>
 
-     <tr>
-     
-       <if @folders.type@ eq "folder">
-         <td><img border="0" src="@folders.url@graphics/folder.gif"></td>
-         <td><a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a></td>
-         <td><small>@folders.type@</small></td>
-         <if @folders.content_size@ eq 0>
-           <td><small>0 items</small></td>
-         </if>
-         <else>
-           <if @folders.content_size@ gt 1>
-             <td><small>@folders.content_size@ items</small></td>
-           </if>
-           <else>
-             <td><small>@folders.content_size@ item</small></td>
-           </else>
-         </else>
-     </if>
-     <else>
-       <if @folders.type@ eq "url">
-         <td><img border="0" src="@folders.url@graphics/file.gif"></td>
-         <td><a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a></td>
-         <td><small>@folders.type@</small></td>
-         <td>&nbsp;</td>
-       </if>
-       <else>
-         <td><img border="0" src="@folders.url@graphics/file.gif"></td>
-         <td><a href="@folders.url@download/@folders.name@?version_id=@folders.live_revision@">@folders.name@</a></td>
-         <td><small>@folders.type@</small></td>
-         <td><small>@folders.content_size@ byte<if @folders.content_size ne 1>s</if></small></td>
-         </td>
-        </else>
-     </else>
-  
-     </tr>  
+<if @folders.type@ eq "folder">
+        <td><img border="0" src="@folders.url@graphics/folder.gif"></td>
+        <td><a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a></td>
+        <td><small>@folders.type@</small></td>
+<if @folders.content_size@ eq 0>
+        <td><small>0 items</small></td>
+</if>
+<else>
+<if @folders.content_size@ gt 1>
+        <td><small>@folders.content_size@ items</small></td>
+</if>
+<else>
+        <td><small>@folders.content_size@ item</small></td>
+</else>
+</else>
+</if>
+<else>
+<if @folders.type@ eq "url">
+        <td><img border="0" src="@folders.url@graphics/file.gif"></td>
+        <td><a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a></td>
+        <td><small>@folders.type@</small></td>
+        <td>&nbsp;</td>
+</if>
+<else>
+        <td><img border="0" src="@folders.url@graphics/file.gif"></td>
+        <td><a href="@folders.url@download/@folders.name@?version_id=@folders.live_revision@">@folders.name@</a></td>
+        <td><small>@folders.type@</small></td>
+        <td><small>@folders.content_size@ byte<if @folders.content_size ne 1>s</if></small></td>
+</else>
+</else>
 
-  </multiple>
- 
-  <if @write_p@ true>
-    <table border=0>
-      <tr>
-        <td>
-          <small><a href="@url@file-add?folder_id=@folder_id@">Upload a file</a></small>
-        </td>
       </tr>
+
+</multiple>
+
+<if @write_p@ true>
       <tr>
-        <td>
-          <small><a href="@url@simple-add?folder_id=@folder_id@">Create a URL</a></small>
+        <td colspan="4">
+          <nobr>
+            <small>
+              <a href="@url@file-add?folder_id=@folder_id@">Upload a file</a>
+              |
+              <a href="@url@simple-add?folder_id=@folder_id@">Create a URL</a>
+            </small>
+          </nobr>
         </td>
       </tr>
-    </table>
-  </if>
+</if>
 
-</else>
+    </table>
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	31 May 2002 06:34:27 -0000	1.1
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	4 Jun 2002 16:34:12 -0000	1.2
@@ -51,10 +51,13 @@
 set url [portal::mapping::get_url -object_id $folder_id]
 set recurse_p 1
 set contents_url "${url}folder-contents?[export_vars {folder_id recurse_p}]&"
-set write_p [permission::permission_p -object_id $folder_id -privilege "write"]
+
 set admin_p [permission::permission_p -object_id $folder_id -privilege "admin"]
+set write_p $admin_p
+if {!$write_p} {
+    set write_p [permission::permission_p -object_id $folder_id -privilege "write"]
+}
 set delete_p $admin_p
-
 if {!$delete_p} {
     set delete_p [permission::permission_p -object_id $folder_id -privilege "delete"]
 }
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	31 May 2002 06:34:27 -0000	1.11
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	4 Jun 2002 16:34:12 -0000	1.12
@@ -62,9 +62,11 @@
     set contents_url "${contents_url}?"
 }
 
-set write_p [permission::permission_p -object_id $folder_id -privilege "write"]
 set admin_p [permission::permission_p -object_id $folder_id -privilege "admin"]
-
+set write_p $admin_p
+if {!$write_p} {
+    set write_p [permission::permission_p -object_id $folder_id -privilege "write"]
+}
 set delete_p $admin_p
 if {!$delete_p} {
     set delete_p [permission::permission_p -object_id $folder_id -privilege "delete"]