Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.160 -r1.161
--- openacs-4/packages/xowiki/xowiki.info	14 Mar 2018 15:40:49 -0000	1.160
+++ openacs-4/packages/xowiki/xowiki.info	15 Mar 2018 09:10:15 -0000	1.161
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d6" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d6.apm">
+    <version name="5.10.0d7" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d7.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2017-08-06</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d6"/>
+        <provides url="xowiki" version="5.10.0d7"/>
         <requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
 	<requires url="acs-tcl" version="5.10.0d2"/>
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 {
Index: openacs-4/packages/xowiki/tcl/resource-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/resource-init.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xowiki/tcl/resource-init.tcl	14 Mar 2018 15:40:49 -0000	1.1
+++ openacs-4/packages/xowiki/tcl/resource-init.tcl	15 Mar 2018 09:10:15 -0000	1.2
@@ -3,10 +3,15 @@
 #
 template::register_urn -urn urn:ad:js:jquery      -resource /resources/xowiki/jquery/jquery.min.js
 template::register_urn -urn urn:ad:js:bootstrap3  -resource //maxcdn.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js
-template::register_urn -urn urn:ad:js:get-http-object -resource /resources/xowiki/get-http-object.js
+template::register_urn -urn urn:ad:js:get-http-object \
+    -resource /resources/xowiki/get-http-object.js
+template::register_urn -urn urn:ad:js:bootstrap3-treeview \
+    -resource //cdnjs.cloudflare.com/ajax/libs/bootstrap-treeview/1.2.0/bootstrap-treeview.min.js
 
 template::register_urn -urn urn:ad:css:bootstrap3 -resource //maxcdn.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css
 template::register_urn -urn urn:ad:css:xowiki     -resource /resources/xowiki/xowiki.css
+template::register_urn -urn urn:ad:css:bootstrap3-treeview \
+    -resource /cdnjs.cloudflare.com/ajax/libs/bootstrap-treeview/1.2.0/bootstrap-treeview.min.css
 
 
 
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 -r1.17 -r1.18
--- openacs-4/packages/xowiki/tcl/tree-procs.tcl	14 Mar 2018 15:40:49 -0000	1.17
+++ openacs-4/packages/xowiki/tcl/tree-procs.tcl	15 Mar 2018 09:10:15 -0000	1.18
@@ -206,17 +206,18 @@
   #   - render_node {{-open:boolean false} cat_content}
   #   - render_item {{-highlight:boolean false} item}
   #
-  # The last two methods are required.
+  # The last two methods are required.  Below are the currently
+  # defined tree renderers. We use as naming convention
+  # TreeRenderer=<style>.
 
-  # Below are the currently defined tree renderers. We use as naming
-  # convention TreeRenderer=<style>.
-  #
+  #--------------------------------------------------------------------------------
   # List-specific renderer
   # 
   # This is a very common render that maps the tree structure into an
   # unordered HTML list. The rendered is specialized by e.g. the
   # mktree an yuitree render below.
-  #
+  #--------------------------------------------------------------------------------  
+
   TreeRenderer create TreeRenderer=list 
   TreeRenderer=list proc include_head_entries {args} {
     # In the general case, we have nothing to include.  more
@@ -271,9 +272,9 @@
     return "<li $o_atts><span $h_atts>[:prefix] $entry</span>$content"
   }
   
-  #
+  #--------------------------------------------------------------------------------
   # List-specific renderer based on mktree
-  #
+  #--------------------------------------------------------------------------------
   TreeRenderer create TreeRenderer=mktree \
       -superclass TreeRenderer=list \
       -li_expanded_atts [list "class='liOpen'" "class='liClosed'"]
@@ -287,9 +288,9 @@
     return "<ul class='mktree' id='[$tree id]'>[next]</ul>"
   }
 
-  #
+  #--------------------------------------------------------------------------------
   # List-specific renderer based for some menus
-  #
+  #--------------------------------------------------------------------------------  
   TreeRenderer create TreeRenderer=samplemenu \
       -superclass TreeRenderer=list \
       -li_expanded_atts [list "class='menu-open'" "class='menu-closed'"] \
@@ -302,10 +303,9 @@
     return "<ul class='menu' id='[$tree id]'>[next]</ul>"
   }
 
-  #
+  #--------------------------------------------------------------------------------
   # List-specific renderer based on yuitree
-  #
-
+  #--------------------------------------------------------------------------------
   TreeRenderer create TreeRenderer=yuitree \
       -superclass TreeRenderer=list \
       -li_expanded_atts [list "class='expanded'" ""]
@@ -334,10 +334,9 @@
   }
 
 
-  #
+  #--------------------------------------------------------------------------------
   # list-specific render with YUI drag and drop functionality
-  #
-
+  #--------------------------------------------------------------------------------  
   TreeRenderer create TreeRenderer=listdnd \
       -superclass TreeRenderer=list \
       -li_expanded_atts [list "" ""]
@@ -375,9 +374,9 @@
     return [next]
   }
 
-  #
-  # a tree rendere based on a section structure
-  #
+  #--------------------------------------------------------------------------------
+  # Tree renderer based on a section structure
+  #--------------------------------------------------------------------------------
   TreeRenderer create TreeRenderer=sections \
       -superclass TreeRenderer=list 
   TreeRenderer=sections instproc render_item {{-highlight:boolean false} item} {
@@ -401,6 +400,83 @@
        <div style='margin-left: 2em; margin-right:0px;'>$cat_content</div>\n"
   }
 
+  #--------------------------------------------------------------------------------
+  # Bootstrap tree renderer based on
+  # http://jonmiles.github.io/bootstrap-treeview/
+  #--------------------------------------------------------------------------------  
+
+  TreeRenderer create TreeRenderer=bootstrap3
+  TreeRenderer=bootstrap3 proc include_head_entries {args} {
+    ::xo::Page requireJS urn:ad:js:jquery
+    ::xo::Page requireCSS urn:ad:css:bootstrap3-treeview
+    ::xo::Page requireJS  urn:ad:js:bootstrap3-treeview
+    security::csp::require style-src cdnjs.cloudflare.com
+    security::csp::require script-src cdnjs.cloudflare.com
+  }
+
+  TreeRenderer=bootstrap3 proc render {tree} {
+    set jsTree [string trimright [next] ", \n"]
+    set id [$tree id]
+    set options ""
+    lappend options \
+        "enableLinks: true"
+    template::add_body_script -script "\n\$('#$id').treeview({data: \[$jsTree\], [join $options ,] });"
+    return "<div id='$id'></div>"
+  }
+  TreeRenderer=bootstrap3 instproc render_href {href} {
+    if {${:href} ne ""} {
+      set jsHref "href: '[::xowiki::Includelet js_encode $href]',"
+    } else {
+      set jsHref ""
+    }
+    return $jsHref
+  }
+  TreeRenderer=bootstrap3 instproc render_item {{-highlight:boolean false} item} {
+    :log "======UNTESTED============ highlight $highlight item $item"
+    $item instvar title href prefix suffix
+    set label  [::xowiki::Includelet js_encode "$prefix$title$suffix"]
+    set jsHref [:render_href ${href}]
+    set selected [expr {$highlight ? "true" : "false"}]
+    return "\n{text: '${label}', $jsHref state: {selected: $selected}},"
+  }
+  TreeRenderer=bootstrap3 instproc render_node {{-open:boolean false} cat_content} {
+    #:log "open $open cat_content $cat_content"
+
+    if {[info exists :count]} {
+      set jsTags "tags: \['${:count}'\],"
+    } else {
+      set jsTags ""
+    }
+    set jsHref [:render_href ${:href}]
+    if {$cat_content ne ""} {
+      set cat_content [string trimright $cat_content ", \n"]
+      set content ", \nnodes: \[$cat_content\]\n"
+    } else {
+      set content ""
+    }
+    set label [::xowiki::Includelet js_encode ${:label}]
+    set expanded [expr {${:expanded} ? "true" : "false"}]
+    set selected [expr {${:highlight} ? "true" : "false"}]
+    return "\n{text: '${label}', $jsTags $jsHref state: {expanded: $expanded, selected: $selected} $content},"
+  }
+
+  #--------------------------------------------------------------------------------
+  # Bootstrap3 tree renderer with folder structure
+  #--------------------------------------------------------------------------------  
+  TreeRenderer create TreeRenderer=bootstrap3-folders -superclass TreeRenderer=bootstrap3
+  TreeRenderer=bootstrap3-folders proc render {tree} {
+    set jsTree [string trimright [next] ", \n"]
+    set id [$tree id]
+    set options ""
+    lappend options \
+        "expandIcon: 'glyphicon glyphicon-folder-close'" \
+        "collapseIcon: 'glyphicon glyphicon-folder-open'" \
+        "enableLinks: true"
+    template::add_body_script -script "\n\$('#$id').treeview({data: \[$jsTree\], [join $options ,] });"
+    return "<div id='$id'></div>"
+  }
+
+  
 }
 ::xo::library source_dependent