Index: openacs-4/packages/fs-portlet/catalog/fs-portlet.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/catalog/fs-portlet.de_DE.ISO-8859-1.xml,v
diff -u -r1.7.2.1.4.2 -r1.7.2.1.4.3
--- openacs-4/packages/fs-portlet/catalog/fs-portlet.de_DE.ISO-8859-1.xml	14 Oct 2004 03:21:45 -0000	1.7.2.1.4.2
+++ openacs-4/packages/fs-portlet/catalog/fs-portlet.de_DE.ISO-8859-1.xml	22 Dec 2004 17:28:35 -0000	1.7.2.1.4.3
@@ -5,6 +5,7 @@
   <msg key="bytes">Bytes</msg>
   <msg key="create_new_folder">Neuen Ordner erstellen</msg>
   <msg key="create_url">Neue URL hinzuf�gen</msg>
+  <msg key="edit_upload_size_limit">Gr��enlimit f�r Uploads ver�ndern</msg>
   <msg key="item">Element</msg>
   <msg key="items">Elemente</msg>
   <msg key="pretty_name">Dateien</msg>
Index: openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.10.6.4 -r1.10.6.5
--- openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml	14 Oct 2004 03:21:45 -0000	1.10.6.4
+++ openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml	22 Dec 2004 17:28:35 -0000	1.10.6.5
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="fs-portlet" package_version="2.1.0b1" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="advanced">(&lt;font=red&gt;Advanced&lt;/font&gt;)</msg>
   <msg key="byte">byte</msg>
   <msg key="bytes">bytes</msg>
   <msg key="create_new_folder">Create a new folder</msg>
   <msg key="create_url">Create a URL</msg>
+  <msg key="edit_fs_parameters">Edit file storage parameters (ADVANCED)</msg>
   <msg key="edit_upload_size_limit">Edit Upload Size Limit</msg>
   <msg key="item">item</msg>
   <msg key="items">items</msg>
Index: openacs-4/packages/fs-portlet/www/fs-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-admin-portlet.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/fs-portlet/www/fs-admin-portlet.adp	5 Aug 2004 22:54:31 -0000	1.1.2.2
+++ openacs-4/packages/fs-portlet/www/fs-admin-portlet.adp	22 Dec 2004 17:28:35 -0000	1.1.2.3
@@ -21,5 +21,5 @@
 
 <ul>
   <li><a href=file-storage/admin/upload-size-limit?<%=[export_url_vars return_url]%>>#fs-portlet.edit_upload_size_limit#</a>
-
+ <li><a href=@fs_url@>#fs-portlet.edit_fs_parameters#</a>
 </ul>
Index: openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl	14 Jul 2004 19:38:56 -0000	1.1.2.1
+++ openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl	22 Dec 2004 17:28:35 -0000	1.1.2.2
@@ -37,3 +37,6 @@
 set user_id [ad_conn user_id]
 
 ad_return_template
+
+set package_id [site_node_apm_integration::get_child_package_id -package_key "file-storage"]
+set fs_url "/shared/parameters?[export_url_vars package_id return_url]"
\ No newline at end of file
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.10.6.4 -r1.10.6.5
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	29 Aug 2004 23:57:48 -0000	1.10.6.4
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	22 Dec 2004 17:28:35 -0000	1.10.6.5
@@ -20,3 +20,6 @@
 
 <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>
+<if @webdav_url@ not nil>
+      <p>#file-storage.Folder_available_via_WebDAV_at#</p>
+</if>
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.5.2.1.4.3 -r1.5.2.1.4.4
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	29 Aug 2004 23:57:48 -0000	1.5.2.1.4.3
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	22 Dec 2004 17:28:35 -0000	1.5.2.1.4.4
@@ -57,7 +57,6 @@
 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]
@@ -74,4 +73,10 @@
     -url [ad_conn url]?folder_id=$folder_id \
     ]
 
+set use_webdav_p  [ad_parameter "UseWebDavP"]
+
+if { $use_webdav_p == 1} { 
+    set webdav_url [fs::webdav_url -item_id $folder_id]
+}
+
 ad_return_template 
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.26.2.1.4.2 -r1.26.2.1.4.3
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	29 Aug 2004 23:57:48 -0000	1.26.2.1.4.2
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	22 Dec 2004 17:28:35 -0000	1.26.2.1.4.3
@@ -117,4 +117,7 @@
 
 <p>@notification_chunk;noquote@</p>
 
+<if @webdav_url@ not nil>
+      <p>#file-storage.Folder_available_via_WebDAV_at#</p>
+</if>
 
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.17.6.2 -r1.17.6.3
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	29 Aug 2004 23:57:48 -0000	1.17.6.2
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	22 Dec 2004 17:28:35 -0000	1.17.6.3
@@ -50,6 +50,12 @@
     set user_root_folder_present_p 1
 } else {
     set folder_id [lindex $list_of_folder_ids 0]
+    set file_storage_node_id [site_node::get_node_id_from_object_id \
+                             -object_id [ad_conn package_id]]
+    set file_storage_package_id [site_node::get_children \
+                                -package_key file-storage \
+                                -node_id $file_storage_node_id \
+                                -element package_id]
 }
 
 set url [site_node_object_map::get_url -object_id $folder_id]
@@ -94,4 +100,12 @@
     -url [ad_conn url]?folder_id=$folder_id \
     ]
 
+set use_webdav_p  [parameter::get -package_id $file_storage_package_id -parameter "UseWebDavP"]
+
+if { $use_webdav_p == 1} { 
+    set webdav_url [fs::webdav_url -item_id $folder_id -package_id $file_storage_package_id]
+}
+
+
+
 ad_return_template