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 -N -r1.10.6.3 -r1.10.6.4
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	8 Aug 2004 00:41:30 -0000	1.10.6.3
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	29 Aug 2004 23:57:48 -0000	1.10.6.4
@@ -18,22 +18,5 @@
 
 %>
 
-    <table border="0" cellpadding="2" cellspacing="2" width="100%">
-
-<if @write_p@ true>
-      <tr>
-        <td colspan="4">
-          <nobr>
-            <small>[
-              <a href="@url@file-add?folder_id=@folder_id@">#fs-portlet.upload_file#</a>
-              |
-              <a href="@url@simple-add?folder_id=@folder_id@">#fs-portlet.create_url#</a>
-            ]</small>
-          </nobr>
-          <br><br>
-        </td>
-      </tr>
-</if>
-</table>
 <include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@root_folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
 <p>@notification_chunk;noquote@</p>
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 -N -r1.5.2.1.4.2 -r1.5.2.1.4.3
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	8 Aug 2004 00:41:31 -0000	1.5.2.1.4.2
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	29 Aug 2004 23:57:48 -0000	1.5.2.1.4.3
@@ -29,9 +29,6 @@
     user_id:onevalue
     user_root_folder:onevalue
     user_root_folder_present_p:onevalue
-    write_p:onevalue
-    admin_p:onevalue
-    delete_p:onevalue
     url:onevalue
     folders:multirow
     n_folders:onevalue
@@ -60,22 +57,13 @@
 set root_folder_id [fs::get_root_folder -package_id $file_storage_package_id]
 
 set folder_id [lindex $list_of_folder_ids 0]
+ns_log Notice "Huh? folder_id: $folder_id root_folder_id: $root_folder_id"
 set scope_fs_url "/packages/file-storage/www/folder-chunk"
 set n_past_days ""
 set url [site_node_object_map::get_url -object_id $folder_id]
 set recurse_p 1
 set contents_url "${url}folder-contents?[export_vars {folder_id recurse_p}]&"
 
-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"]
-}
-
 # Enable Notifications
 
 set folder_name [fs_get_folder_name $folder_id]
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 -N -r1.26.2.1.4.1 -r1.26.2.1.4.2
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	22 Jul 2004 10:11:16 -0000	1.26.2.1.4.1
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	29 Aug 2004 23:57:48 -0000	1.26.2.1.4.2
@@ -20,6 +20,12 @@
 
 <if @config.shaded_p@ false>
 
+<if @scoped_p@ eq 1>
+<include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
+</if>
+
+<else>
+
 <if @write_p@ true>
   <table width="100%">
     <tr>
@@ -39,13 +45,6 @@
 
 </if>
 
-
-<if @scoped_p@ eq 1>
-<include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
-</if>
-
-<else>
-
   <table class="table-display" border="0" cellpadding="3" cellspacing="0" width="100%">
     <multiple name="folders">
        <if @folders.rownum@ odd>
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 -N -r1.17.6.1 -r1.17.6.2
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	22 Jul 2004 10:11:16 -0000	1.17.6.1
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	29 Aug 2004 23:57:48 -0000	1.17.6.2
@@ -62,15 +62,17 @@
     set contents_url "${contents_url}?"
 }
 
-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"]
+if { !$scoped_p } {
+    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"]
+    }
 }
-set delete_p $admin_p
-if {!$delete_p} {
-    set delete_p [permission::permission_p -object_id $folder_id -privilege "delete"]
-}
 
 set query "select_folders"
 if {$scoped_p} {