Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v diff -u -r1.44 -r1.45 --- openacs-4/packages/xowiki/tcl/folder-procs.tcl 1 Feb 2018 22:16:44 -0000 1.44 +++ openacs-4/packages/xowiki/tcl/folder-procs.tcl 15 Mar 2018 09:10:15 -0000 1.45 @@ -35,24 +35,39 @@ } folders instproc include_head_entries {} { - ::xowiki::Tree include_head_entries -renderer yuitree -style folders + switch [${:package_id} get_parameter PreferredCSSToolkit bootstrap] { + yui {::xowiki::Tree include_head_entries -renderer yuitree -style folders} + bootstrap - + default { ::xowiki::Tree include_head_entries -renderer bootstrap3 } + } } folders instproc render {} { :get_parameters - set js " - var [:js_name]; - YAHOO.util.Event.onDOMReady(function() { - [:js_name] = new YAHOO.widget.TreeView('foldertree_[:id]'); - [:js_name].subscribe('clickEvent',function(oArgs) { - var m = /href=\"(\[^\"\]+)\"/.exec(oArgs.node.html); - return false; - }); - [:js_name].render(); - }); - " + set tree [:build_tree] - return [$tree render -style yuitree -js $js] + switch [${:package_id} get_parameter PreferredCSSToolkit bootstrap] { + yui { + set js " + var [:js_name]; + YAHOO.util.Event.onDOMReady(function() { + [:js_name] = new YAHOO.widget.TreeView('foldertree_[:id]'); + [:js_name].subscribe('clickEvent',function(oArgs) { + var m = /href=\"(\[^\"\]+)\"/.exec(oArgs.node.html); + return false; + }); + [:js_name].render(); + }); + " + set HTML [$tree render -style yuitree -js $js] + } + bootstrap - + default { + set HTML [$tree render -style bootstrap3-folders] + } + } + #:log HTML=$HTML + return $HTML } folders instproc folder_query {