Index: openacs-4/packages/categories/www/cadmin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/index.tcl	27 Apr 2003 11:37:12 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/index.tcl	14 Dec 2003 15:36:58 -0000	1.3
@@ -25,18 +25,50 @@
 
 permission::require_permission -object_id $package_id -privilege category_admin
 
-template::multirow create trees_with_write_permission tree_id tree_name site_wide_p short_name
-template::multirow create trees_with_read_permission tree_id tree_name site_wide_p short_name
+template::multirow create trees_with_write_permission tree_id tree_name site_wide_p description
+template::multirow create trees_with_read_permission tree_id tree_name site_wide_p descrption
 
 
-db_foreach trees "" {
+db_foreach trees {} {
+    array unset tree_array
+    array set tree_array [category_tree::get_data $tree_id $locale]
+
     if { [string equal $has_write_p "t"] } {
-	set tree_name [category_tree::get_name $tree_id $locale]
-	template::multirow append trees_with_write_permission $tree_id $tree_name $site_wide_p
+	template::multirow append trees_with_write_permission $tree_id $tree_array(tree_name) $site_wide_p $tree_array(description)
     } elseif { [string equal $has_read_p "t"] || [string equal $site_wide_p "t"] } {
-	set tree_name [category_tree::get_name $tree_id $locale]
-	template::multirow append trees_with_read_permission $tree_id $tree_name $site_wide_p
+	template::multirow append trees_with_read_permission $tree_id $tree_name $site_wide_p $tree_array(description)
     }
 }
 
-ad_return_template
+multirow extend trees_with_read_permission view_url
+multirow foreach trees_with_read_permission {
+    set view_url [export_vars -no_empty -base tree-view { tree_id locale }]
+}
+
+multirow extend trees_with_write_permission view_url
+multirow foreach trees_with_write_permission {
+    set view_url [export_vars -no_empty -base tree-view { tree_id locale }]
+}
+
+
+set elements {
+    tree_name {
+	label "Name"
+	link_url_col view_url
+    }
+    description {
+	label "Description"
+    }
+}
+
+template::list::create \
+    -name trees_with_write_permission \
+    -no_data "None" \
+    -elements $elements
+
+template::list::create \
+    -name trees_with_read_permission \
+    -no_data "None" \
+    -elements $elements
+
+set create_url [export_vars -no_empty -base tree-form { locale }]
\ No newline at end of file