Index: openacs-4/packages/xowiki/resources/templates/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view.adp,v
diff -u -N -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
@@ -1,12 +1,12 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
                   <property name="&body">body</property>
                   <property name="&doc">doc</property>
                   <property name="head">
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+        <script language='javascript' src='/resources/acs-templating/mktreeg.js' async type='text/javascript'></script>
       @header_stuff;literal@</property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/resources/templates/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view2.adp,v
diff -u -N -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -7,7 +7,7 @@
                   <property name="head">
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+        <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       @header_stuff;literal@</property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp,v
diff -u -N -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	6 Oct 2016 09:24:47 -0000	1.1.2.4
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	9 Oct 2016 08:47:29 -0000	1.1.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -17,7 +17,7 @@
         </style>
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+        <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       @header_stuff;literal@</property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3.adp,v
diff -u -N -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -12,7 +12,7 @@
         </style>
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+        <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       @header_stuff;literal@</property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp,v
diff -u -N -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -13,10 +13,10 @@
 
 <%
 if {$book_prev_link ne ""} {
-  template::add_event_listener  -id bookNavPrev.a  -prevent_preventdefault=false  -script [subst {TocTree.getPage("$book_prev_link");}]
+  template::add_event_listener  -id bookNavPrev.a  -preventdefault=false  -script [subst {TocTree.getPage("$book_prev_link");}]
 }
 if {$book_next_link ne ""} {
-  template::add_event_listener  -id bookNavNext.a  -prevent_preventdefault=false  -script [subst {TocTree.getPage("$book_next_link");}]
+  template::add_event_listener  -id bookNavNext.a  -preventdefault=false  -script [subst {TocTree.getPage("$book_next_link");}]
 }
 %>                      <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
Index: openacs-4/packages/xowiki/resources/templates/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book.adp,v
diff -u -N -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -13,10 +13,10 @@
 
 <%
 if {$book_prev_link ne ""} {
-  template::add_event_listener  -id bookNavPrev.a  -prevent_preventdefault=false  -script [subst {TocTree.getPage("$book_prev_link");}]
+  template::add_event_listener  -id bookNavPrev.a  -preventdefault=false  -script [subst {TocTree.getPage("$book_prev_link");}]
 }
 if {$book_next_link ne ""} {
-  template::add_event_listener  -id bookNavNext.a  -prevent_preventdefault=false  -script [subst {TocTree.getPage("$book_next_link");}]
+  template::add_event_listener  -id bookNavNext.a  -preventdefault=false  -script [subst {TocTree.getPage("$book_next_link");}]
 }
 %>                      <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
Index: openacs-4/packages/xowiki/resources/templates/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-default.adp,v
diff -u -N -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/resources/templates/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-links.adp,v
diff -u -N -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/resources/templates/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-plain.adp,v
diff -u -N -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/xowiki/resources/templates/view-plain.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
+++ openacs-4/packages/xowiki/resources/templates/view-plain.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -N -r1.45.2.7 -r1.45.2.8
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	6 Oct 2016 09:24:47 -0000	1.45.2.7
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	9 Oct 2016 08:47:30 -0000	1.45.2.8
@@ -136,7 +136,7 @@
   ADP_Generator create oacs-view -master 1 -footer 1 \
       -extra_header_stuff {
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+        <script language='javascript' src='/resources/acs-templating/mktreeg.js' async type='text/javascript'></script>
       } \
       -proc content_part {} {
         set open_page {-open_page [list @name@]}
@@ -165,7 +165,7 @@
       -extra_header_stuff {
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+        <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       } \
       -proc before_render {page} {
         ::xo::cc set_parameter weblog_page weblog-portlet
@@ -228,7 +228,7 @@
         </style>
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+        <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       } \
       -proc before_render {page} {
         ::xo::cc set_parameter weblog_page weblog-portlet
@@ -293,7 +293,7 @@
         </style>
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+        <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       } \
       -proc before_render {page} {
         ::xo::cc set_parameter weblog_page weblog-portlet
@@ -375,13 +375,13 @@
 if {$book_prev_link ne ""} {
   template::add_event_listener \
       -id bookNavPrev.a \
-      -prevent_preventdefault=false \
+      -preventdefault=false \
       -script [subst {TocTree.getPage("$book_prev_link");}]
 }
 if {$book_next_link ne ""} {
   template::add_event_listener \
       -id bookNavNext.a \
-      -prevent_preventdefault=false \
+      -preventdefault=false \
       -script [subst {TocTree.getPage("$book_next_link");}]
 }
 %>                      <div style="float:left; width: 25%; font-size: .8em;
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 -N -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/xowiki/tcl/tree-procs.tcl	11 Sep 2016 01:04:56 -0000	1.13.2.1
+++ openacs-4/packages/xowiki/tcl/tree-procs.tcl	9 Oct 2016 08:47:30 -0000	1.13.2.2
@@ -281,7 +281,8 @@
 
   TreeRenderer=mktree proc include_head_entries {args} {
     ::xo::Page requireCSS  "/resources/xowiki/cattree.css"
-    ::xo::Page requireJS  "/resources/acs-templating/mktree.js"
+    #::xo::Page requireJS  "/resources/acs-templating/mktree.js"
+    template::add_body_script -src "/resources/acs-templating/mktree.js"
   }
   TreeRenderer=mktree proc render {tree} {
     return "<ul class='mktree' id='[$tree id]'>[next]</ul>"
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -N -r1.36.2.2 -r1.36.2.3
--- openacs-4/packages/xowiki/www/admin/list.tcl	1 Oct 2016 11:04:31 -0000	1.36.2.2
+++ openacs-4/packages/xowiki/www/admin/list.tcl	9 Oct 2016 08:47:30 -0000	1.36.2.3
@@ -86,7 +86,10 @@
       Field mod_user -label [_ xowiki.By_user] -orderby mod_user
       AnchorField delete -CSSclass delete-item-button -label ""
     }
+#    -renderer BootstrapTableRenderer
 
+
+
 lassign [split $orderby ,] att order
 t1 orderby -order [expr {$order eq "asc" ? "increasing" : "decreasing"}] $att
 
@@ -153,6 +156,8 @@
 	  [::template::t1 last_child] set page_order $page_order
         }
 
+
+#ns_log notice "t1 renderer [t1 renderer] [t1 procsearch render]"
 set t1 [t1 asHTML]
 # db_foreach clobbers title, so re-establish it
 set title $page_title