Index: openacs-4/packages/xowiki/tcl/category-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/category-procs.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/xowiki/tcl/category-procs.tcl 13 May 2009 13:23:27 -0000 1.17 +++ openacs-4/packages/xowiki/tcl/category-procs.tcl 13 May 2009 13:40:36 -0000 1.18 @@ -32,9 +32,9 @@ CatTree instproc open_tree {} {;} CatTree instproc render {{-style mktree}} { - set renderer CategoryStyle=$style + set renderer CategoryRenderer=$style if {![my isclass $renderer]} { - error "No such renderer $renderer (avalialble [info cmd ::xowiki::CategoryStyle=*]" + error "No such renderer $renderer (avalialble [info cmd ::xowiki::CategoryRenderer=*]" } Category instmixin $renderer @@ -87,23 +87,23 @@ # # These are the list-specific rendering functions # - Class create CategoryStyle=mktree - CategoryStyle=mktree proc render {cattree} { + Class create CategoryRenderer=mktree + CategoryRenderer=mktree proc render {cattree} { #::xo::Page requireCSS "/resources/acs-templating/mktree.css" ::xo::Page requireCSS "/resources/xowiki/cattree.css" ::xo::Page requireJS "/resources/acs-templating/mktree.js" foreach c [$cattree children] {append content [$c render] \n} return "" } - CategoryStyle=mktree instproc render_item {{-highlight:boolean false} item} { + CategoryRenderer=mktree instproc render_item {{-highlight:boolean false} item} { if {$highlight} { return "
  • $item
  • \n" } else { return "
  • $item
  • \n" } } - CategoryStyle=mktree instproc render_category {{-open:boolean false} cat_content} { + CategoryRenderer=mktree instproc render_category {{-open:boolean false} cat_content} { set open_state [expr {[my set open_requests]>0?"class='liOpen'" : "class='liClosed'"}] set c [expr {[my exists count] ? "([my count])" : ""}] return "
  • [my label] $c\n \n" @@ -113,20 +113,20 @@ # These are the section-specific rendering functions # - Class create CategoryStyle=sections - CategoryStyle=sections proc render {cattree} { + Class create CategoryRenderer=sections + CategoryRenderer=sections proc render {cattree} { set content "" foreach c [$cattree children] {append content [$c render] \n} return $content } - CategoryStyle=sections instproc render_item {{-highlight:boolean false} item} { + CategoryRenderer=sections instproc render_item {{-highlight:boolean false} item} { if {$highlight} { return "$item
    \n" } else { return "$item
    \n" } } - CategoryStyle=sections instproc render_category {{-open:boolean false} cat_content} { + CategoryRenderer=sections instproc render_category {{-open:boolean false} cat_content} { set section [expr {[my level] + 2}] return "[my label]\n

    \

    $cat_content
    \n"