Index: openacs-4/packages/fs-portlet/catalog/fs-portlet.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/catalog/fs-portlet.ch_zh.utf-8.xml,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/fs-portlet/catalog/fs-portlet.ch_zh.utf-8.xml	17 May 2004 15:15:18 -0000	1.3
+++ openacs-4/packages/fs-portlet/catalog/fs-portlet.ch_zh.utf-8.xml	28 Aug 2008 20:35:16 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="fs-portlet" package_version="2.0.3" locale="ch_zh" charset="utf-8">
+<message_catalog package_key="fs-portlet" locale="ch_zh" charset="utf-8">
 
   <msg key="byte">字节</msg>
   <msg key="bytes">字节</msg>
Index: openacs-4/packages/fs-portlet/catalog/fs-portlet.en_AU.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/catalog/fs-portlet.en_AU.ISO-8859-1.xml,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/fs-portlet/catalog/fs-portlet.en_AU.ISO-8859-1.xml	15 Dec 2006 22:45:35 -0000	1.3
+++ openacs-4/packages/fs-portlet/catalog/fs-portlet.en_AU.ISO-8859-1.xml	28 Aug 2008 20:35:16 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="fs-portlet" package_version="2.2.0" locale="en_AU" charset="ISO-8859-1">
+<message_catalog package_key="fs-portlet" locale="en_AU" charset="ISO-8859-1">
 
   <msg key="byte">byte</msg>
   <msg key="bytes">bytes</msg>
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.33 -r1.34
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	2 Aug 2007 09:09:26 -0000	1.33
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	28 Aug 2008 20:35:16 -0000	1.34
@@ -19,7 +19,11 @@
 %>
 
 <if @config.shaded_p@ false>
+<if @use_ajaxfs_p@ eq 1>
+<include src="/packages/ajax-filestorage-ui/lib/ajaxfs-include" package_id="@file_storage_package_id@" folder_id="@folder_id@" layoutdiv="fscontainer">
+</if>
 
+<div id="fscontainer">
 <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@ allow_bulk_actions="1" fs_url="@url@" page_num="@page_num@">
 </if>
@@ -42,6 +46,7 @@
     #new-portal.when_portlet_shaded#
   </small>
 </else>
+</div>
 
 <p>@notification_chunk;noquote@</p>
 
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.22 -r1.23
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	15 May 2007 20:14:42 -0000	1.22
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	28 Aug 2008 20:35:16 -0000	1.23
@@ -49,6 +49,7 @@
 if {![empty_string_p $user_root_folder] && [lsearch -exact $list_of_folder_ids $user_root_folder] != -1} {
     set folder_id $user_root_folder
     set user_root_folder_present_p 1
+    set use_ajaxfs_p 0
 } else {
     set folder_id [lindex $list_of_folder_ids 0]
     set file_storage_node_id [site_node::get_node_id_from_object_id \
@@ -57,6 +58,8 @@
                                 -package_key file-storage \
                                 -node_id $file_storage_node_id \
                                 -element package_id]
+    set use_ajaxfs_p [parameter::get -package_id $file_storage_package_id -parameter UseAjaxFs -default 0]
+
 }
 
 set url [site_node_object_map::get_url -object_id $folder_id]
@@ -180,5 +183,4 @@
     }
 }
 
-
 ad_return_template