Index: openacs-4/packages/categories/www/cadmin/category-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/category-delete.adp 14 Dec 2003 15:36:57 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/category-delete.adp 5 Feb 2004 18:58:48 -0000 1.4 @@ -4,28 +4,13 @@ @locale;noquote@

- Are you sure you want to delete these categories: + Are you sure you want to delete these categories:

- + -
-
- @form_vars;noquote@ - -
- - -
- @form_vars;noquote@ - -
- -
+

+ Delete +     + No, Cancel +

Index: openacs-4/packages/categories/www/cadmin/category-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/category-delete.tcl 1 Feb 2004 19:12:51 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/category-delete.tcl 5 Feb 2004 18:58:48 -0000 1.5 @@ -13,14 +13,15 @@ page_title:onevalue context_bar:onevalue locale:onevalue - form_vars:onevalue + delete_url:onevalue + cancel_url:onevalue mapped_objects_p:onevalue } set user_id [ad_maybe_redirect_for_registration] permission::require_permission -object_id $tree_id -privilege category_tree_write -multirow create categories category_id name objects_p +multirow create categories category_id category_name objects_p foreach id $category_id { multirow append categories \ @@ -32,7 +33,8 @@ array set tree [category_tree::get_data $tree_id $locale] set tree_name $tree(tree_name) -set form_vars [export_vars -form { tree_id category_id:multiple locale object_id }] +set delete_url [export_vars -no_empty -base category-delete-2 { tree_id category_id:multiple locale object_id }] +set cancel_url [export_vars -no_empty -base tree-view { tree_id locale object_id }] set page_title "Delete categories" if {[info exists object_id]} { @@ -42,4 +44,18 @@ } lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] "Delete categories" +template::list::create \ + -name categories \ + -no_data "None" \ + -elements { + category_name { + label "Name" + } + objects_p { + display_template { + (Still mapped to objects) + } + } + } + ad_return_template Index: openacs-4/packages/categories/www/cadmin/category-set-parent.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/category-set-parent.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/category-set-parent.adp 22 May 2003 14:25:54 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/category-set-parent.adp 5 Feb 2004 18:58:48 -0000 1.3 @@ -3,27 +3,4 @@ @context_bar;noquote@ @locale;noquote@ - - - - - - - - - - - -
Category NameHierarchy Level
Root Level 0
- @tree.left_indent;noquote@ - - @tree.category_name@ - - - @tree.category_name@ - - - - @tree.level@ -
- + Index: openacs-4/packages/categories/www/cadmin/category-set-parent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/category-set-parent.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/category-set-parent.tcl 1 Feb 2004 19:12:51 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/category-set-parent.tcl 5 Feb 2004 18:58:48 -0000 1.4 @@ -14,7 +14,6 @@ context_bar:onevalue locale:onevalue tree_name:onevalue - url_vars:onevalue tree:multirow } @@ -24,7 +23,6 @@ array set one_tree [category_tree::get_data $tree_id $locale] set tree_name $one_tree(tree_name) -set url_vars [export_vars {tree_id category_id locale object_id}] set page_title "Choose a parent node" if {[info exists object_id]} { @@ -37,17 +35,37 @@ set subtree_categories_list [db_list subtree ""] -template::multirow create tree category_name category_id deprecated_p level left_indent url_p +template::multirow create tree category_name category_id deprecated_p level left_indent parent_url +template::multirow append tree "Root Level" 0 f 0 "" \ + [export_vars -no_empty -base category-set-parent-2 {tree_id category_id locale object_id}] foreach category [category_tree::get_tree -all $tree_id $locale] { util_unlist $category category_id category_name deprecated_p level if { [lsearch $subtree_categories_list $category_id]==-1 } { - set url_p 1 + set parent_url [export_vars -no_empty -base category-set-parent-2 [list [list parent_id $category_id] tree_id category_id locale object_id]] } else { - set url_p 0 + set parent_url "" } - template::multirow append tree $category_name $category_id $deprecated_p $level [category::repeat_string " " [expr ($level-1)*5]] $url_p + template::multirow append tree $category_name $category_id $deprecated_p $level [category::repeat_string " " [expr ($level-1)*5]] $parent_url } +template::list::create \ + -name tree \ + -no_data "None" \ + -elements { + category_name { + label "Name" + display_template { + @tree.left_indent;noquote@ @tree.category_name@ + } + } + set_parent { + label "Action" + display_template { + Set parent + } + } + } + ad_return_template Index: openacs-4/packages/categories/www/cadmin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/index.adp 14 Dec 2003 15:36:57 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/index.adp 5 Feb 2004 18:58:48 -0000 1.4 @@ -16,4 +16,3 @@

Create a new tree - 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 -N -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/index.tcl 1 Feb 2004 19:12:51 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/index.tcl 5 Feb 2004 18:58:48 -0000 1.5 @@ -71,4 +71,4 @@ -no_data "None" \ -elements $elements -set create_url [export_vars -no_empty -base tree-form { locale }] \ No newline at end of file +set create_url [export_vars -no_empty -base tree-form { locale }] Index: openacs-4/packages/categories/www/cadmin/one-object.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/one-object.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/one-object.adp 22 May 2003 14:25:54 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/one-object.adp 5 Feb 2004 18:58:48 -0000 1.3 @@ -3,63 +3,15 @@ @context_bar;noquote@ @locale;noquote@ -

+ - -

-Create and map a new category tree +Create and map a new category tree Index: openacs-4/packages/categories/www/cadmin/one-object.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/one-object.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/one-object.tcl 1 Feb 2004 19:12:51 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/one-object.tcl 5 Feb 2004 18:58:48 -0000 1.4 @@ -16,7 +16,6 @@ mapped_trees:multirow unmapped_trees:multirow object_name:onevalue - url_vars:onevalue } set user_id [ad_maybe_redirect_for_registration] @@ -26,29 +25,77 @@ set object_name [lindex $context_bar 1] set page_title "Category Management" set context_bar [list $context_bar $page_title] -set url_vars [export_vars {locale object_id}] -template::multirow create mapped_trees tree_name tree_id site_wide_p subtree_category_id subtree_category_name +template::multirow create mapped_trees tree_name tree_id site_wide_p assign_single_p require_category_p unmap_url db_foreach get_mapped_trees "" { + set tree_name [category_tree::get_name $tree_id $locale] if {![empty_string_p $subtree_category_id]} { - set subtree_category_name [category::get_name $subtree_category_id $locale] - } else { - set subtree_category_name "" + append tree_name " :: [category::get_name $subtree_category_id $locale]" } - set tree_name [category_tree::get_name $tree_id $locale] - template::multirow append mapped_trees $tree_name $tree_id $site_wide_p $subtree_category_id $subtree_category_name + template::multirow append mapped_trees $tree_name $tree_id $site_wide_p \ + $assign_single_p $require_category_p \ + [export_vars -no_empty -base tree-unmap { tree_id locale object_id }] } +template::multirow create unmapped_trees tree_id tree_name site_wide_p map_url subtree_url -template::multirow create unmapped_trees tree_id tree_name site_wide_p - db_foreach get_unmapped_trees "" { if { [string equal $has_read_permission t] || [string equal $site_wide_p t] } { set tree_name [category_tree::get_name $tree_id $locale] - template::multirow append unmapped_trees $tree_id $tree_name $site_wide_p + + template::multirow append unmapped_trees $tree_id $tree_name $site_wide_p \ + [export_vars -no_empty -base tree-map { tree_id locale object_id }] \ + [export_vars -no_empty -base subtree-choose { tree_id locale object_id }] } } +template::list::create \ + -name mapped_trees \ + -no_data "None" \ + -elements { + tree_name { + label "Name" + link_url_eval {[export_vars -no_empty -base tree-view { tree_id locale object_id }]} + } + flags { + display_template { + (Site-Wide Tree, + single, multiple, + required) optional) + } + } + unmap { + label "Action" + display_template { + Unmap + } + } + } + +template::list::create \ + -name unmapped_trees \ + -no_data "None" \ + -elements { + tree_name { + label "Name" + link_url_eval {[export_vars -no_empty -base tree-view { tree_id locale object_id }]} + } + site_wide_p { + display_template { + (Site-Wide Tree) + } + } + map { + label "Action" + display_template { + Map tree     + Choose subtree to map + } + } + } + +set create_url [export_vars -no_empty -base tree-form { locale }] + ad_return_template Index: openacs-4/packages/categories/www/cadmin/one-object.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/one-object.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/one-object.xql 23 Apr 2003 12:29:27 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/one-object.xql 5 Feb 2004 18:58:48 -0000 1.2 @@ -4,7 +4,8 @@ - select t.tree_id, t.site_wide_p, m.subtree_category_id + select t.tree_id, t.site_wide_p, m.subtree_category_id, + m.assign_single_p, m.require_category_p from category_trees t, category_tree_map m where m.object_id = :object_id and m.tree_id = t.tree_id Index: openacs-4/packages/categories/www/cadmin/permission-manage.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/permission-manage.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/permission-manage.adp 23 Apr 2003 12:29:27 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/permission-manage.adp 5 Feb 2004 18:58:48 -0000 1.2 @@ -5,14 +5,14 @@

- This is a site wide category tree + This is a site wide category tree

- Make it Local + Make it Local - This tree is local + This tree is local

- Make it Site-Wide + Make it Site-Wide Index: openacs-4/packages/categories/www/cadmin/subtree-choose.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/subtree-choose.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/subtree-choose.adp 1 Feb 2004 19:12:51 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/subtree-choose.adp 5 Feb 2004 18:58:48 -0000 1.4 @@ -3,15 +3,4 @@ @context_bar;noquote@ @locale;noquote@ - -

- - - - - - -
@tree.left_indent;noquote@ @tree.category_name@ [ Add this subtree ] @tree.level@
- + Index: openacs-4/packages/categories/www/cadmin/subtree-choose.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/subtree-choose.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/subtree-choose.tcl 1 Feb 2004 19:12:51 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/subtree-choose.tcl 5 Feb 2004 18:58:48 -0000 1.3 @@ -13,7 +13,6 @@ page_title:onevalue context_bar:onevalue locale:onevalue - url_vars:onevalue tree:multirow } @@ -26,16 +25,35 @@ } set page_title "Choose a subtree to map" -set url_vars [export_vars {locale object_id}] set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"] "Map subtree"] -template::multirow create tree category_id category_name level left_indent +template::multirow create tree category_id category_name level left_indent map_url foreach category [category_tree::get_tree -all $tree_id $locale] { util_unlist $category category_id category_name deprecated_p level - template::multirow append tree $category_id $category_name $level [category::repeat_string " " [expr ($level-1)*5]] + template::multirow append tree $category_id $category_name $level \ + [category::repeat_string " " [expr ($level-1)*5]] \ + [export_vars -no_empty -base tree-map { category_id tree_id locale object_id }] } +template::list::create \ + -name tree \ + -no_data "None" \ + -elements { + category_name { + label "Name" + display_template { + @tree.left_indent;noquote@ @tree.category_name@ + } + } + map { + label "Action" + display_template { + Map this subtree + } + } + } + ad_return_template Index: openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl 1 Feb 2004 19:12:52 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl 5 Feb 2004 18:58:48 -0000 1.3 @@ -5,15 +5,16 @@ @author Timo Hentschel (timo@timohentschel.de) @cvs-id $Id: } { - tree_id:integer + target_tree_id:integer source_tree_id:integer {locale ""} object_id:integer,optional } set user_id [ad_maybe_redirect_for_registration] +set tree_id $target_tree_id permission::require_permission -object_id $tree_id -privilege category_tree_write -category_tree::copy -source_tree $source_tree_id -dest_tree $tree_id +category_tree::copy -source_tree $source_tree_id -dest_tree $target_tree_id ad_returnredirect [export_vars -base tree-view {tree_id locale object_id}] Index: openacs-4/packages/categories/www/cadmin/tree-copy.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/tree-copy.adp 22 May 2003 14:25:54 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/tree-copy.adp 5 Feb 2004 18:58:48 -0000 1.3 @@ -3,22 +3,4 @@ @context_bar;noquote@ @locale;noquote@ - - - -
-There are no category trees available -
- -

+ Index: openacs-4/packages/categories/www/cadmin/tree-copy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/tree-copy.tcl 1 Feb 2004 19:12:52 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/tree-copy.tcl 5 Feb 2004 18:58:48 -0000 1.4 @@ -14,16 +14,15 @@ locale:onevalue trees:multirow tree_id:onevalue - url_vars:onevalue } set user_id [ad_maybe_redirect_for_registration] permission::require_permission -object_id $tree_id -privilege category_tree_write -set url_vars [export_vars {locale object_id}] set page_title "Choose a tree to copy" array set tree [category_tree::get_data $tree_id $locale] set tree_name $tree(tree_name) +set target_tree_id $tree_id if {[info exists object_id]} { set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]] @@ -32,13 +31,37 @@ } lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] "Copy a tree" -template::multirow create trees tree_id tree_name site_wide_p +template::multirow create trees tree_id tree_name site_wide_p view_url copy_url db_foreach trees_select "" { if {$site_wide_p == "t" || $has_read_p == "t"} { set source_tree_name [category_tree::get_name $source_tree_id $locale] - template::multirow append trees $source_tree_id $source_tree_name $site_wide_p + + template::multirow append trees $source_tree_id $source_tree_name $site_wide_p \ + [export_vars -no_empty -base tree-view-simple { source_tree_id target_tree_id locale object_id }] \ + [export_vars -no_empty -base tree-copy-2 { source_tree_id target_tree_id locale object_id }] } } +template::list::create \ + -name trees \ + -no_data "None" \ + -elements { + tree_name { + label "Name" + link_url_col view_url + } + site_wide_p { + display_template { + (Site-Wide Tree) + } + } + copy { + label "Action" + display_template { + Copy this tree + } + } + } + ad_return_template Index: openacs-4/packages/categories/www/cadmin/tree-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/tree-delete.adp 22 May 2003 14:25:54 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/tree-delete.adp 5 Feb 2004 18:58:48 -0000 1.3 @@ -16,20 +16,16 @@ -

The following categories of this tree are still in use: -

+

Categories still used + +

Are you sure you want to delete the tree "@tree_name@"? -

-
- @form_vars;noquote@ - -
-
- @form_vars;noquote@ - -
-
+

+ Delete +     + No, Cancel +

Index: openacs-4/packages/categories/www/cadmin/tree-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/tree-delete.tcl 1 Feb 2004 19:12:52 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/tree-delete.tcl 5 Feb 2004 18:58:48 -0000 1.4 @@ -15,8 +15,8 @@ tree_name:onevalue tree_description:onevalue instances_using_p:onevalue - form_vars:onevalue - url_vars:onevalue + delete_url:onevalue + cancel_url:onevalue used_categories:multirow } @@ -43,14 +43,23 @@ set instances_using_p f } -set form_vars [export_form_vars tree_id locale object_id] -set url_vars [export_vars {tree_id locale object_id}] +set delete_url [export_vars -no_empty -base tree-delete-2 {tree_id locale object_id}] +set cancel_url [export_vars -no_empty -base tree-view {tree_id locale object_id}] -template::multirow create used_categories category_id name +template::multirow create used_categories category_id category_name db_foreach get_category_in_use "" { set category_name [category::get_name $category_id $locale] template::multirow append used_categories $category_id $category_name } +template::list::create \ + -name used_categories \ + -no_data "None" \ + -elements { + category_name { + label "Name" + } + } + ad_return_template Index: openacs-4/packages/categories/www/cadmin/tree-usage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-usage.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/tree-usage.tcl 1 Feb 2004 19:12:52 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/tree-usage.tcl 5 Feb 2004 18:58:48 -0000 1.3 @@ -32,7 +32,7 @@ if {[info exists object_id]} { set context_bar [list [category::get_object_context $object_id] [list [export_vars -base one-object {locale object_id}] "Category Management"]] } else { - set context_bar [list [list ".?[export_vars {locale}] "Category Management"]] + set context_bar [list [list ".?[export_vars {locale}]" "Category Management"]] } lappend context_bar [list [export_vars -base tree-view {tree_id locale object_id}] $tree_name] Usage Index: openacs-4/packages/categories/www/cadmin/tree-view-simple.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/tree-view-simple.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/tree-view-simple.adp 22 May 2003 14:25:54 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/tree-view-simple.adp 5 Feb 2004 18:58:48 -0000 1.3 @@ -3,13 +3,4 @@ @context_bar;noquote@ @locale;noquote@ - - - - - - - -
Category Name
  • @tree.left_indent;noquote@ @tree.category_name@
    • + Index: openacs-4/packages/categories/www/cadmin/tree-view-simple.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/tree-view-simple.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/tree-view-simple.tcl 1 Feb 2004 19:12:52 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/tree-view-simple.tcl 5 Feb 2004 18:58:48 -0000 1.3 @@ -5,7 +5,7 @@ @author Timo Hentschel (timo@timohentschel.de) @cvs-id $Id: } { - tree_id:integer + source_tree_id:integer target_tree_id:integer {locale ""} object_id:integer,optional @@ -17,6 +17,7 @@ } set user_id [ad_maybe_redirect_for_registration] +set tree_id $source_tree_id array set target_tree [category_tree::get_data $target_tree_id $locale] set target_tree_name $target_tree(tree_name) @@ -45,4 +46,16 @@ template::multirow append tree $category_name $deprecated_p $level [category::repeat_string " " [expr ($level-1)*5]] } +template::list::create \ + -name tree \ + -no_data "None" \ + -elements { + category_name { + label "Name" + display_template { + @tree.left_indent;noquote@ @tree.category_name@ + } + } + } + ad_return_template Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/tree-view.tcl 1 Feb 2004 19:12:52 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/tree-view.tcl 5 Feb 2004 18:58:48 -0000 1.4 @@ -157,3 +157,5 @@ -actions $actions \ -bulk_actions $bulk_actions \ -bulk_action_export_vars { tree_id locale object_id } + +ad_return_template