Index: openacs-4/packages/datamanager/www/manage-object1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/Attic/manage-object1.tcl,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/datamanager/www/manage-object1.tcl	28 Oct 2005 10:17:37 -0000	1.1.2.2
+++ openacs-4/packages/datamanager/www/manage-object1.tcl	31 Oct 2005 12:27:58 -0000	1.1.2.3
@@ -11,6 +11,13 @@
 set community_id [dotlrn_community::get_community_id]
 set query_name [join [list select $object_type] "_"]
 
+if { $object_type eq "folder" } {
+   set display_template {<div style="text-indent: @usable_objects.level_num@em;">@usable_objects.object_name@</div>}
+   db_1row select_folder_package_id {}
+   set root_folder_id [fs::get_root_folder -package_id $package_id]
+} else { 
+   set display_template {}
+}
 
   template::list::create\
       -name usable_objects \
@@ -20,6 +27,7 @@
       -elements {
         object_name {
             label "Name"
+            display_template $display_template
         }
         creation_user {
             label "Creation user"
Index: openacs-4/packages/datamanager/www/manage-object1.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/Attic/manage-object1.xql,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/datamanager/www/manage-object1.xql	28 Oct 2005 10:17:37 -0000	1.1.2.2
+++ openacs-4/packages/datamanager/www/manage-object1.xql	31 Oct 2005 12:27:58 -0000	1.1.2.3
@@ -51,6 +51,8 @@
     WHERE ao.object_id in (select content_id from static_portal_content where body <> '' and package_id=:community_id) and spc.content_id=ao.object_id and not(spc.pretty_name like '#dotlrn-static%_info_%#')
       </querytext>
 </fullquery>
+
+
 <fullquery name="select_forum">
       <querytext>
       SELECT ao.title as object_name,
@@ -71,8 +73,36 @@
    </querytext>
 </fullquery>
 
+<fullquery name="select_folder">
+      <querytext>
+        SELECT cf.label as object_name,
+               cf.folder_id as object_id,
+               us1.username as creation_user,
+               ao.creation_date,
+               tree_level(ci1.tree_sortkey) as level_num
+        FROM cr_folders cf,
+             cr_items ci1,
+             cr_items ci2,
+             acs_objects ao,
+             users us1
+        WHERE ci1.tree_sortkey between ci2.tree_sortkey and tree_right(ci2.tree_sortkey)
+              and ci2.item_id=:root_folder_id
+              and ci1.item_id=cf.folder_id
+              and ao.object_id=cf.folder_id
+              and ao.creation_user=us1.user_id
+        ORDER BY ci1.tree_sortkey
+      </querytext>
+</fullquery>
 
+<fullquery name="select_folder_package_id">
+<querytext>
+    select package_id 
+    from dotlrn_community_applets 
+    where applet_id=(select applet_id from dotlrn_applets where applet_key='dotlrn_fs') and community_id=:community_id;
+</querytext>
+</fullquery>
 
+
 </queryset>
 
     
Index: openacs-4/packages/datamanager/www/select-objects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/Attic/select-objects.tcl,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/datamanager/www/select-objects.tcl	28 Oct 2005 10:17:37 -0000	1.1.2.2
+++ openacs-4/packages/datamanager/www/select-objects.tcl	31 Oct 2005 12:29:28 -0000	1.1.2.3
@@ -10,9 +10,6 @@
 set context [list]
 
 switch $object_type {
-    folder { 
-        set object_url manage-object4
-    }
     new { 
         set object_url manage-object2
     }
Index: openacs-4/packages/datamanager/www/use-dotlrn_fs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/use-dotlrn_fs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/datamanager/www/use-dotlrn_fs.tcl	31 Oct 2005 12:29:28 -0000	1.1.2.1
@@ -0,0 +1,45 @@
+ad_page_contract {
+    Just call the callback implemented in file-storage package
+    @author Luis de la Fuente(lfuente@it.uc3m.es)
+    @creation_date 2005-07-18
+    
+} -query {
+     object_id:notnull
+     action:notnull
+     dest_community_id:multiple
+} -properties {
+}
+
+
+set selected_community $dest_community_id
+dotlrn::require_user_admin_community  -community_id [dotlrn_community::get_community_id]
+set context [list []]
+set title "[_ datamanager.Confirmation]"    
+
+switch $action {
+    "move" {
+          foreach object $object_id {
+            #only administrator or professor must be allowed to enter this page
+            dotlrn::require_user_admin_community  -community_id $selected_community
+            callback -catch datamanager::move_folder -object_id $object -selected_community $selected_community
+          }
+    }
+    "copy" {
+         foreach community $selected_community {
+            foreach object $object_id { 
+                 #only administrator or professor must be allowed to enter this page
+                dotlrn::require_user_admin_community  -community_id $community
+                callback -catch datamanager::copy_folder -object_id $object -selected_community $community
+            }
+         }
+    }
+    "delete" {
+        callback -catch datamanager::delete_folder -object_id $object_id         
+    }
+    default {
+    }
+}
+
+
+
+ad_returnredirect "./"