\ -
$cat_content\n" - } - - # # Commonly used code for categories # + Class create Category Category proc get_mapped_trees { -object_id {-locale ""} Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v diff -u -r1.113 -r1.114 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 15 May 2009 07:05:19 -0000 1.113 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 29 May 2009 13:37:48 -0000 1.114 @@ -101,6 +101,11 @@ string map [list \n \\n \" {\"} ' {\'}] $string } + ::xowiki::Includelet proc html_encode {string} { + return [string map [list & "&" < "<" > ">" \" """ ' "'"] $string] + } + + ::xowiki::Includelet proc html_id {name} { # Construct a valid HTML id or name. # For details, see http://www.w3.org/TR/html4/types.html @@ -623,7 +628,7 @@ } categories instproc include_head_entries {} { - ::xowiki::CatTree include_head_entries -style [my set style] + ::xowiki::Tree include_head_entries -renderer [my set style] } categories instproc category_tree_edit_button {-object_id:integer -locale {-allow_edit false} -tree_id:integer} { @@ -697,10 +702,13 @@ return [my category_tree_missing -name $tree_name -edit_html $edit_html] } + if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]} + foreach tree $trees { foreach {tree_id my_tree_name ...} $tree {break} - set edit_html [my category_tree_edit_button -object_id $package_id -allow_edit $allow_edit -tree_id $tree_id] + set edit_html [my category_tree_edit_button -object_id $package_id \ + -allow_edit $allow_edit -tree_id $tree_id] #append content "
Create Form from Content Index: openacs-4/packages/xowiki/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v diff -u -r1.176 -r1.177 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 14 May 2009 08:56:44 -0000 1.176 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 29 May 2009 13:37:48 -0000 1.177 @@ -1086,6 +1086,7 @@ db_transaction { foreach {page_id item_id name old_page_order new_page_order} [concat $drop_renames $gap_renames] { #my log "--cpo UPDATE $page_id new_page_order $new_page_order" + $temp_obj item_id $item_id $temp_obj update_attribute_from_slot -revision_id $page_id $slot $new_page_order ::xo::clusterwide ns_cache flush xotcl_object_cache ::$item_id ::xo::clusterwide ns_cache flush xotcl_object_cache ::$page_id Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/tcl/tree-procs.tcl 29 May 2009 13:37:48 -0000 1.1 @@ -0,0 +1,338 @@ +::xo::library doc { + Classes for creating, manageing and rendering trees + + @creation-date 2009-05-29 + @author Gustaf Neumann + @cvs-id $Id: tree-procs.tcl,v 1.1 2009/05/29 13:37:48 gustafn Exp $ +} + +namespace eval ::xowiki { + # + # ::xowiki::Tree + # + # This class manages the creation and rendering of the nodes of the + # tree. It provides a name and id for rending in HTML. + + Class Tree \ + -superclass ::xo::OrderedComposite \ + -parameter { + {name ""} + id + } + + # + # Class methods + # + Tree proc renderer {style} { + set renderer TreeRenderer=$style + if {![my isclass $renderer]} { + error "No such renderer $renderer (avalialble [info commands ::xowiki::TreeRenderer=*]" + } + return $renderer + } + + Tree proc include_head_entries {{-renderer mktree} args} { + eval [my renderer $renderer] include_head_entries $args + } + + # + # Instance methods + # + Tree instproc init {} { + # If there is no id specified, use the name as id. + if {![my exists id]} {my id [my name]} + } + + Tree instproc add_item { + -category + -orderby + -itemobj + {-increasing:boolean true} + {-open_item:boolean false} + } { + set items ${category}::items + if {![my isobject $items]} { + ::xo::OrderedComposite create $items + if {[info exists orderby]} { + if {$orderby eq "page_order"} { + $items mixin add ::xo::OrderedComposite::IndexCompare + } + set direction [expr {$increasing ? "increasing" : "decreasing"}] + $items orderby -order $direction $orderby + } + } + $items add $itemobj + if {$open_item} { + $category open_tree + $itemobj set open_item 1 + } + } + Tree instproc open_tree {} {;} + Tree instproc render {{-style mktree} {-js ""} {-context ""}} { + set renderer [[self class] renderer $style] + $renderer set context $context + $renderer set js $js + TreeNode instmixin $renderer + set content [$renderer render [self]] + TreeNode instmixin "" + if {[$renderer set js] ne ""} { + append content "\n\n" + } + return $content + } + + # + # ::xowiki::TreeNode + # + # The TreeNode represents an n-ary node storing its child nodes in + # an ordered composite. In addition to its children, every node may + # have items associated. For example, a tree of categories can have + # associated categorized items, which can be added via the method + # "add_item". + # + Class TreeNode -superclass ::xo::OrderedComposite -parameter { + level label pos {open_requests 0} count {href ""} + object owner li_id ul_id ul_class + {prefix ""} {expanded true} {highlight false} + } + + TreeNode instproc open_tree {} { + my open_requests 1 + if {[my exists __parent]} {[my set __parent] open_tree} + } + + TreeNode instproc some_child_has_items {} { + foreach i [my children] { + if {[my isobject ${i}::items]} {return 1} + if {[$i some_child_has_items]} {return 1} + } + return 0 + } + + TreeNode instproc render {} { + set content "" + if {[my isobject [self]::items]} { + foreach i [[self]::items children] { + append cat_content [my render_item -highlight [$i exists open_item] $i ] + } + foreach c [my children] {append cat_content [$c render] \n} + append content [my render_node -open [expr {[my open_requests]>0}] $cat_content] + } elseif {[my open_requests]>0 || [my some_child_has_items]} { + set cat_content "" + foreach c [my children] {append cat_content [$c render] \n} + append content [my render_node -open true $cat_content] + + } + return $content + } + + # + # The rendering of trees is performed via rendering classes. All + # renderers are created and configured via the meta-class + # TreeRenderer. This meta-class defines the common attributes and + # behavior of all TreeRenders. + # + # In particular, the TreeRenders are defined to work with xowiki's + # page fragment caching. Via page fragment caching, the result of + # the rendering of includedlets is cached. However, the renderer + # might require additional CSS or JavaScript code, which has to be + # included for the cached HTML fragment as well. Therefore, the + # method "include_head_entries" is provided, which is called + # independently from HTML generation. + # + # + + Class create TreeRenderer -superclass Class \ + -parameter { + {li_expanded_atts ""} + {highlight_atts {"style = 'font-weight:bold;'"}} + } + TreeRenderer instproc include_head_entries {args} { + # to be overloaded + } + TreeRenderer instproc render {tree} { + set content "" + foreach c [$tree children] {append content [$c render] \n} + return $content + } + + # + # The renderers should provide the following methods as procs + # + # - include_head_entries {args} + # - render {tree} + # + # (both are optional) and the following methods as instprocs + # + # - render_node {{-open:boolean false} cat_content} + # - render_item {{-highlight:boolean false} item} + # + # The last two methods are required. + + # Below are the currently defined tree renderers. We use as naming + # convention TreeRenderer=