Index: openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp	2 Jan 2008 07:12:12 -0000	1.6
+++ openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.adp	20 Apr 2008 11:58:12 -0000	1.7
@@ -1,11 +1,12 @@
+    <if @template_head_p@ eq 0>
     <link rel="stylesheet" type="text/css" href="/resources/ajaxhelper/ext2/resources/css/ext-all.css">
     <if @theme@ not nil>
         <link rel="stylesheet" type="text/css" href="/resources/ajaxhelper/ext2/resources/css/xtheme-@theme@.css">
     </if>
-    <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/autocomplete/assets/skins/sam/autocomplete.css" />
+    <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.1/build/autocomplete/assets/skins/sam/autocomplete.css" />
     <link rel="stylesheet" type="text/css" href="/resources/ajax-filestorage-ui/ajaxfs.css">
-    <script type="text/javascript" src="http://yui.yahooapis.com/2.4.1/build/utilities/utilities.js"></script>
-    <script type="text/javascript" src="http://yui.yahooapis.com/2.4.1/build/autocomplete/autocomplete-min.js"></script>
+    <script type="text/javascript" src="http://yui.yahooapis.com/2.5.1/build/utilities/utilities.js"></script>
+    <script type="text/javascript" src="http://yui.yahooapis.com/2.5.1/build/autocomplete/autocomplete-min.js"></script>
     <script type="text/javascript" src="/resources/ajaxhelper/ext2/adapter/yui/ext-yui-adapter.js"></script>
     <script type="text/javascript" src="/resources/ajaxhelper/ext2/ext-all.js"></script>
     <script type="text/javascript" src="/resources/ajax-filestorage-ui/swfupload/swfupload.js"></script>
@@ -15,8 +16,27 @@
     <else>
         <script type="text/javascript" src="/resources/ajax-filestorage-ui/ajaxfs-min.js"></script>
     </else>
+    </if>
     <if @options@ defined>
     <script type="text/javascript">
+     // preload
+    var pic_arr = [
+        "/resources/ajaxhelper/icons/folder.png",
+        "/resources/ajaxhelper/icons/folder_link.png",
+        "/resources/ajaxhelper/icons/link.png",
+        "/resources/ajaxhelper/icons/page_white_acrobat.png",
+        "/resources/ajaxhelper/icons/page_white_excel.png",
+        "/resources/ajaxhelper/icons/page_white_powerpoint.png",
+        "/resources/ajaxhelper/icons/page_white_compressed.png",
+        "/resources/ajaxhelper/icons/page_white_word.png",
+        "/resources/ajaxhelper/icons/film.png",
+        "/resources/ajaxhelper/icons/page_white_picture.png",
+        "/resources/ajaxhelper/icons/page_white.png"
+    ];
+    for(var i=0; i<pic_arr.length; i++) {
+        var preload_img = new Image(16,16);
+        preload_img.src = pic_arr[i];
+    }
     // autocomplete
     var oAutoCompArr = [@suggestions_stub;noquote@];
     // acs-lang
Index: openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.tcl	12 Apr 2008 10:10:58 -0000	1.6
+++ openacs-4/packages/ajax-filestorage-ui/lib/ajaxfs-include.tcl	20 Apr 2008 11:58:12 -0000	1.7
@@ -44,6 +44,26 @@
 }
 # ********************
 
+set template_head_p 0
+if { [info commands ::template::head::add_javascript] ne "" } {
+    set template_head_p 1
+    template::head::add_css -order 500 -href "/resources/ajaxhelper/ext2/resources/css/ext-all.css"
+    template::head::add_css -order 501 -href "/resources/ajaxhelper/ext2/resources/css/xtheme-${theme}.css"
+    template::head::add_css -order 502 -href "http://yui.yahooapis.com/2.5.1/build/autocomplete/assets/skins/sam/autocomplete.css"
+    template::head::add_css -order 503 -href "/resources/ajax-filestorage-ui/ajaxfs.css"
+    template::head::add_javascript -order 101 -src "http://yui.yahooapis.com/2.5.1/build/utilities/utilities.js"
+    template::head::add_javascript -order 102 -src "http://yui.yahooapis.com/2.5.1/build/autocomplete/autocomplete-min.js"
+    template::head::add_javascript -order 103 -src "/resources/ajaxhelper/ext2/adapter/yui/ext-yui-adapter.js"
+    template::head::add_javascript -order 104 -src "/resources/ajaxhelper/ext2/ext-all.js"
+    template::head::add_javascript -order 105 -src "/resources/ajax-filestorage-ui/swfupload/swfupload.js"
+    if { $debug } {
+        template::head::add_javascript -order 106 -src "/resources/ajax-filestorage-ui/ajaxfs.js"
+    } else {
+        template::head::add_javascript -order 106 -src "/resources/ajax-filestorage-ui/ajaxfs-min.js"
+    }
+}
+
+
 if { [exists_and_not_null package_id] } {
 
     set options [list]
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.tcl	12 Apr 2008 10:10:58 -0000	1.6
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/get-foldercontents.tcl	20 Apr 2008 11:58:12 -0000	1.7
@@ -97,8 +97,11 @@
 
 db_multirow -extend { filename icon last_modified_pretty content_size_pretty download_url linkurl object_counter file_list_start file_list_end write_p tags symlink_id qtip} contents $query_name $query  {
 
-    # c/o Franz Penz
+    # cleanup :
+    # remove double quotes, replace with single quotes
     regsub -all {"} $title {\"} title 
+    regsub -all {"} $name {\"} name
+    regsub -all {"} $filename {\"} filename
 
     set symlink_id ""
     set qtip ${title}
@@ -201,21 +204,18 @@
         }
     }
 
-    # cleanup :
-    # remove double quotes, replace with single quotes
-    regsub  -all "\"" $title "" title
-
     # filename and download url
 
     if { $type != "folder" && $type != "symlink"} {
 
         if { ![exists_and_not_null download_url] } {
-            set download_url "${fs_url}download/${name}?[export_vars {{file_id $object_id}}]"
+            set download_url "${fs_url}download/[ad_urlencode ${title}]?[export_vars {{file_id $object_id}}]"
             set linkurl "${fs_url}download/?[export_vars {{file_id $object_id}}]"
         }
 
         set filename $name
         if { $title == $name } { set filename " "}
+
     } else {
 
         set download_url "javascript:void(0)"
@@ -226,7 +226,7 @@
     # get the tags for this fs item
     set tag_list [db_list "get_categories" "select name from category_translations where locale='en_US' and category_id in (select category_id from category_object_map where object_id=:object_id)"]
     if { [llength $tag_list] >0 } {
-        set tags [join $tag_list ","]
+        regsub -all {"} [join $tag_list ","] {\"} tags
     } else {
         set tags ""
     }
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.adp	12 Apr 2008 10:10:58 -0000	1.4
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.adp	20 Apr 2008 11:58:12 -0000	1.5
@@ -1 +1 @@
-[<multiple name="treenodes" delimiter=",">{"text":"@treenodes.name;noquote@","qtip":"@treenodes.qtip;noquote@","id":"@treenodes.id;noquote@","iconCls":"@treenodes.cls;noquote@","singleClickExpand":true,"attributes":{"size":"@treenodes.content_size_pretty@","write_p":"@treenodes.write_p@","type":"@treenodes.type;noquote@","symlink_id":"@treenodes.symlink_id@"}}</multiple>]
\ No newline at end of file
+[<multiple name="treenodes" delimiter=",">{"text":"@treenodes.name;noquote@","qtip":"@treenodes.qtip;noquote@","id":"@treenodes.id;noquote@","iconCls":"@treenodes.cls;noquote@","singleClickExpand":true,"leaf":@treenodes.leaf;noquote@,"expanded":@treenodes.expanded;noquote@@treenodes.children;noquote@,"attributes":{"size":"@treenodes.content_size_pretty@","write_p":"@treenodes.write_p@","type":"@treenodes.type;noquote@","symlink_id":"@treenodes.symlink_id@"}}</multiple>]
\ No newline at end of file
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl	12 Apr 2008 10:10:58 -0000	1.4
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl	20 Apr 2008 11:58:12 -0000	1.5
@@ -23,7 +23,7 @@
     set node [fs::get_root_folder -package_id $package_id]
 }
 
-db_multirow -extend { text id  href cls qtip symlink_id content_size_pretty } "treenodes" "treenodes" { } {
+db_multirow -extend { text id  href cls qtip symlink_id content_size_pretty leaf expanded children } "treenodes" "treenodes" { } {
 
     if { [exists_and_not_null title] } {
         set text $title
@@ -34,8 +34,20 @@
     set symlink_id ""
     set id "$object_id"
     set cls "folder"
+    set children ""
+    set leaf "false"
+    set expanded "false"
     
     set content_size_pretty [lc_numeric $content_size]
+
+    if { $content_size_pretty == 0 } {
+
+        set leaf "true"
+        set expanded "true"
+        set children ",\"children\":\[\]"
+
+    }
+
     append content_size_pretty " [_ file-storage.items]"
 
     if { $type == "symlink" } {