Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.148.2.10 -r1.148.2.11
--- openacs-4/packages/xowiki/xowiki.info	14 Apr 2014 21:33:09 -0000	1.148.2.10
+++ openacs-4/packages/xowiki/xowiki.info	15 Apr 2014 06:47:00 -0000	1.148.2.11
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.152" url="http://openacs.org/repository/download/apm/xowiki-0.152.apm">
+    <version name="0.153" url="http://openacs.org/repository/download/apm/xowiki-0.153.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>2014-02-11</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="0.152"/>
+        <provides url="xowiki" version="0.153"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-kernel" version="5.6.0"/>
         <requires url="acs-subsite" version="5.2"/>
@@ -75,7 +75,7 @@
             <parameter scope="instance" datatype="text"  min_n_values="1"  max_n_values="1"  name="PackageDescription"  description="Description of the Package. This description will appear for example in the Description of the default RSS feed for this package" section_name="Description"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PackagePath"  description="Space delimited names of local URL paths pointing to xowiki instances from where this instance should inherit pages (example: /xowiki /public/wiki)"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PackageTitle"  description="Title of the Package; this title will appear for example in the default RSS feed for this package." section_name="Description"/>
-            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferedCSSToolkit"  default="yui" description="Use either &quot;yui&quot; or &quot;bootstrap&quot;"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferredCSSToolkit"  default="yui" description="Use either &quot;yui&quot; or &quot;bootstrap&quot;"/>
             <parameter scope="instance" datatype="text"  min_n_values="1"  max_n_values="1"  name="WidgetSpecs"  description="Specify pairs of &quot;pagename,fieldname&quot; followed by a Tcl list which is used as a widget spec for ad_form. &quot;pagename&quot; and &quot;fieldname&quot; can contain wild card characters. The following rather complex widget-specs are from openacs.org:
 
 *,text {richtext(richtext),nospell,optional 
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.27.2.5 -r1.27.2.6
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	14 Apr 2014 21:33:09 -0000	1.27.2.5
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	15 Apr 2014 06:47:00 -0000	1.27.2.6
@@ -469,7 +469,7 @@
     # scoping in "-columns"
     set ::with_publish_status [expr {$publish_status ne "ready"}]
 
-    switch [$package_id get_parameter "PreferedCSSToolkit" yui] {
+    switch [$package_id get_parameter "PreferredCSSToolkit" yui] {
       bootstrap {set tableWidgetClass ::xowiki::BootstrapTable}
       default   {set tableWidgetClass ::xowiki::YUIDataTable}
     }
@@ -598,11 +598,7 @@
           -nls_language [$current_folder get_nls_language_from_lang [::xo::cc lang]] \
           $menuEntries
 
-      switch [$context_package_id get_parameter "PreferedCSSToolkit" yui] {
-        bootstrap {set menuBarRenderer render-bootstrap}
-        default   {set menuBarRenderer render-yui}
-      }
-      set menubar [$mb $menuBarRenderer]
+      set menubar [$mb render-preferred]
     }
     set viewers [util_coalesce [$current_folder property viewers] [$current_folder get_parameter viewers]]
     set viewer_links ""
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.191.2.14 -r1.191.2.15
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	15 Apr 2014 06:37:54 -0000	1.191.2.14
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	15 Apr 2014 06:47:00 -0000	1.191.2.15
@@ -3860,7 +3860,7 @@
     if {$renderer ne ""} {
       lappend cmd -renderer $renderer
     } else {
-      switch [$package_id get_parameter "PreferedCSSToolkit" yui] {
+      switch [$package_id get_parameter "PreferredCSSToolkit" yui] {
         bootstrap {set tableRenderer ::xo::Table::BootstrapTableRenderer}
         default   {set tableRenderer ::xo::Table::YUIDataTableRenderer}
       }
Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/xowiki/tcl/menu-procs.tcl	14 Apr 2014 21:33:10 -0000	1.7.2.2
+++ openacs-4/packages/xowiki/tcl/menu-procs.tcl	15 Apr 2014 06:47:00 -0000	1.7.2.3
@@ -334,7 +334,7 @@
   #        $mb add_menu_item -name Package.Startpage \
       #             -item [list text #xowiki.index# url $index_link]
   #
-  #   4) After all updates are performed, use "render-yui" to obtain
+  #   4) After all updates are performed, use "render-preferred" to obtain
   #      the HTML rendering of the menu.
   #
   # Follow the following nameing conventions:
@@ -510,6 +510,14 @@
     return $result
   }
 
+  ::xowiki::MenuBar instproc render-preferred {} {
+    switch [$context_package_id get_parameter "PreferredCSSToolkit" yui] {
+      bootstrap {set menuBarRenderer render-bootstrap}
+      default   {set menuBarRenderer render-yui}
+    }
+    my $menuBarRenderer
+  }
+
   ::xowiki::MenuBar instproc render-yui {} {
     set M [my content]
     set mb [::xowiki::YUIMenuBar -id [my get_prop $M id] -configuration {
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.320.2.13 -r1.320.2.14
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	14 Apr 2014 21:33:10 -0000	1.320.2.13
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	15 Apr 2014 06:47:00 -0000	1.320.2.14
@@ -1315,11 +1315,7 @@
       #
       # At this place, the menu should be complete, we can render it
       #
-      switch [$context_package_id get_parameter "PreferedCSSToolkit" yui] {
-        bootstrap {set menuBarRenderer render-bootstrap}
-        default   {set menuBarRenderer render-yui}
-      }
-      append top_includelets \n "<div class='visual-clear'><!-- --></div>" [$mb $menuBarRenderer]
+      append top_includelets \n "<div class='visual-clear'><!-- --></div>" [$mb render-preferred]
     }
 
     if {[$context_package_id get_parameter "with_user_tracking" 1]} {