Index: openacs-4/packages/xowiki/tcl/yui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/yui-procs.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/xowiki/tcl/yui-procs.tcl	22 Jul 2015 08:41:21 -0000	1.5
+++ openacs-4/packages/xowiki/tcl/yui-procs.tcl	23 Mar 2016 11:57:25 -0000	1.5.2.1
@@ -234,27 +234,25 @@
   ::xo::tdom::Class create YUIContextMenuItem \
       -superclass YUIMenuItem
 
-
-
   ::xowiki::MenuBar instproc render-yui {} {
-    set M [my content]
-    set mb [::xowiki::YUIMenuBar -id [my get_prop $M id] -configuration {
+    set dict [my content]
+    set mb [::xowiki::YUIMenuBar -id [my get_prop $dict id] -configuration {
       {autosubmenudisplay: false, keepopen: true, lazyload: false}
     } {
-      foreach {menu_att menu} $M {
+      foreach {menu_att menu} $dict {
         if {$menu_att eq "id"} continue
-        if {[llength $menu_att] > 1} {
-          # We expect a dict as second list element.. but ignore here for the time being
-          lassign $menu_att menu_att props
-        }
-        ::xowiki::YUIMenuBarItem -text [my get_prop $menu text] {
+        set kind [my get_prop $menu kind]
+        #ns_log notice "entry: kind $kind <$menu_att> <$menu>"
+        
+        if {$kind ne "MenuButton"} continue
+        ::xowiki::YUIMenuBarItem -text [my get_prop $menu label] {
           ::xowiki::YUIMenu {
             foreach {item_att item} $menu {
               if {[string match {[a-z]*} $item_att]} continue
-              set text [my get_prop $item text]
+              set text [my get_prop $item label]
               set url [my get_prop $item url]
               set group [my get_prop $item group]
-              #my msg "ia=$item_att group '$group' // t=$text item=$item"
+              #my log "ia=$item_att group '$group' // t=$text item=$item"
               ::xowiki::YUIMenuItem -text $text -href $url -group $group {}
             }
           }