Index: openacs-4/packages/cms/www/modules/templates/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/cms/www/modules/templates/index.tcl	17 Nov 2004 23:07:37 -0000	1.8
+++ openacs-4/packages/cms/www/modules/templates/index.tcl	9 May 2005 22:44:49 -0000	1.9
@@ -5,34 +5,30 @@
     @author Michael Steigman
     @creation-date October 2004
 } {
-    { item_id:integer ""}
-    { mount_point:optional "templates"}
+    { folder_id:integer ""}
+    { mount_point "templates" }
+    { parent_id:integer ""}
+    { orderby "title,asc" }
+    { page:optional ""}
     { path:optional "" }
 }
 
 set package_url [ad_conn package_url]
 set clipboardfloats_p [clipboard::floats_p]
 
-# Tree hack
-if { $item_id == [cm::modules::templates::getRootFolderID] } {
-  set refresh_id ""
-} else {
-  set refresh_id $item_id
-}
-
 if { ! [string equal $path {}] } {
 
     set item_id [db_string get_id ""]
 
-    if { [string equal $item_id {}] } {
+    if { [string equal $folder_id {}] } {
 
         set msg "The requested folder <tt>$path</tt> does not exist."
         request error invalid_path $msg
     }
 } else {
 
-  if { [string equal $item_id {}] } {
-      set item_id [db_string get_root_folder_id ""]
+  if { [string equal $folder_id {}] } {
+      set folder_id [cm::modules::templates::getRootFolderID [ad_conn package_id]]
   }
 
   set path [db_string get_path ""]
@@ -49,55 +45,16 @@
 
 set page_title "Template Folder - $info(label)"
 
-set folder_id $item_id
-set parent_id $item_id
+#set folder_id $item_id
+#set parent_id $item_id
 
-template::list::create \
-    -name folder_contents \
-    -multirow folder_contents \
-    -has_checkboxes \
-    -actions [list "New Template" [export_vars -base new-template?mount_point=templates {folder_id}] "Create a new template within this folder" \
-		  "New Folder" [export_vars -base new-folder?mount_point=templates {parent_id}] "Create a new folder within this folder" \
-		  "Move Items" [export_vars -base move?mount_point=sitemap {folder_id}] "Move folder" \
-		  "Copy Items" [export_vars -base copy?mount_point=sitemap {folder_id}] "Copy folder" \
-		  "Delete Items" [export_vars -base delete?mount_point=sitemap {folder_id}] "Delete folder"] \
-    -elements {
-	copy {
-	    label "Clipboard"
-	    display_template "<center>@folder_contents.copy;noquote@</center>"
-	}
-	name {
-	    label "Name"
-	    link_url_col item_url
-	    link_html { title "View this item" }
-	}
-	file_size {
-	    label "Size"
-	}
-	type {
-	    label "Type"
-	}
-	modified {
-	    label "Last Modified"
-	}
-	transact {
-	    display_template "<if @folder_contents.is_folder@ ne 1><a href=\"@folder_contents.edit_url@\" title=\"Edit template\">edit</a> &nbsp; | &nbsp; \
-                              <a href=\"@folder_contents.upload_url@\" title=\"Upload template\">upload</a></if>" 
-	}
-    }
+set actions "Attributes [export_vars -base ../sitemap/attributes?mount_point=templates {folder_id}] \"Folder Attributes\"
+\"Delete Folder\" [export_vars -base ../sitemap/delete?mount_point=templates {folder_id parent_id}] \"Delete this folder\"
+\"Rename Folder\" [export_vars -base ../sitemap/rename?mount_point=templates {folder_id}] \"Rename this folder\"
+\"New Template\" [export_vars -base new-template?mount_point=templates {folder_id}] \"Create a new template within this folder\"
+\"New Folder\" [export_vars -base new-folder?mount_point=templates {parent_id}] \"Create a new folder within this folder\"
+\"Move Items\" [export_vars -base move?mount_point=templates {folder_id}] \"Move folder\"
+\"Copy Items\" [export_vars -base copy?mount_point=templates {folder_id}] \"Copy folder\"
+\"Delete Items\" [export_vars -base delete?mount_point=templates {folder_id}] \"Delete folder\"
+"
 
-db_multirow -extend { copy file_size is_folder template_id upload_url edit_url type item_url } -unclobber folder_contents get_folders "" {
-    set copy [clipboard::render_bookmark templates $item_id $package_url]
-    set is_folder 1
-    set type "Template Folder"
-    set item_url [export_vars -base index { item_id }]
-}
-
-db_multirow -append -extend { copy is_folder folder_id label upload_url edit_url type item_url } folder_contents get_items "" {
-    set copy [clipboard::render_bookmark templates $item_id $package_url]
-    set is_folder 0
-    set type "Template"
-    set item_url [export_vars -base properties { item_id }]
-    set edit_url [export_vars -base edit { template_id }]
-    set upload_url [export_vars -base upload { template_id }]
-}