Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	3 Oct 2003 14:00:13 -0000	1.15
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	15 Dec 2003 11:18:45 -0000	1.16
@@ -5,6 +5,7 @@
     @creation-date Feb 22, 2002
     @cvs-id $Id$
 } -query {
+    {orderby:optional}
 } -properties {
     folder_name:onevalue
     contents:multirow
@@ -32,12 +33,64 @@
 
 set root_folder_id [fs::get_root_folder]
 
-db_multirow -extend { last_modified_pretty content_size_pretty } contents select_folder_contents {} {
+set actions [list]
+set actions [list "Upload File" file-add?[export_vars folder_id] "Upload a file in this folder" "Add Link" simple-add?[export_vars folder_id] "Add a link to a web page" "\#file-storage.New_Folder\#" folder-create?[export_vars {{parent_id $folder_id}}] "\#file-storage.Create_a_new_folder\#" ]
+
+#if {$delete_p} {
+#    lappend actions "Delete Folder" folder-delete "Delete folder and all contents"
+#}
+
+#set n_past_filter_values [list [list "Yesterday" 1] [list [_ file-storage.last_week] 7] [list [_ file-storage.last_month] 30]]
+set elements [list icon \
+		  [list label "" \
+		       display_template {<a href="@contents.file_url@"><img src="@contents.icon@"  border=0 alt="#file-storage.folder#" /></a>}] \
+		  name \
+		  [list label [_ file-storage.Name] \
+		       link_url_col file_url \
+		       orderby_desc {fs_objects.name desc} \
+		       orderby_asc {fs_objects.name asc}] \
+		  content_size_pretty \
+		  [list label [_ file-storage.Size] \
+		       orderby_desc {content_size desc} \
+		       orderby_asc {content_size asc}] \
+		  type [list label [_ file-storage.Type] \
+			    orderby_desc {type desc} \
+			    orderby_asc {type asc}] \
+		  last_modified_pretty \
+		  [list label [_ file-storage.Last_Modified] \
+		       orderby_desc {last_modified_ansi desc} \
+		       orderby_asc {last_modified_ansi asc}] \
+		  properties_link \
+		  [list label "" \
+		       link_url_col properties_url]
+	      ]
+
+template::list::create \
+    -name contents \
+    -multirow contents \
+    -key object_id \
+    -actions $actions \
+    -filters {
+	folder_id {hide_p 1}
+    } \
+    -elements $elements
+
+set orderby [template::list::orderby_clause -orderby -name contents]
+
+if {[string equal $orderby ""]} {
+    set orderby " order by fs_objects.sort_key, fs_objects.name asc"
+}
+
+db_multirow -extend { icon last_modified_pretty content_size_pretty properties_link properties_url} contents select_folder_contents {} {
     set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi]
 
     set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"]
-
     set content_size_pretty [lc_numeric $content_size]
+    if {[string equal $type "folder"]} {
+	append content_size_pretty " [_ file-storage.items]"
+    } else {
+	append content_size_pretty " [_ file-storage.bytes]"
+    }
 
     set file_upload_name [fs::remove_special_file_system_characters -string $file_upload_name]
 
@@ -46,6 +99,18 @@
     }
 
     set name [lang::util::localize $name]
+    if {![string equal $type folder]} {
+	set properties_link [_ file-storage.properties]
+	set properties_url "file?[export_vars {{file_id $object_id}}]"
+	set icon "/resources/file-storage/file.gif"
+        set file_url "view/${file_url}"
+    } else {
+	set properties_link ""
+	set properties_url ""
+	set icon "/resources/file-storage/folder.gif"
+	set file_url "index?[export_vars {{folder_id $object_id}}]"
+    }
+    
 }
 
 ad_return_template