Skip to Content

Changes for page Menu Macro

Last modified by Drunk Monkey on 2024-10-07 11:49
From version 7.1
edited by Drunk Monkey
on 2023-04-26 20:38
Change comment: Install extension [org.xwiki.platform:xwiki-platform-menu-ui/15.3]
To version 8.1
edited by Drunk Monkey
on 2023-05-31 14:32
Change comment: Install extension [org.xwiki.platform:xwiki-platform-menu-ui/15.4]

Summary

Details

XWiki.JavaScriptExtension[0]
Code
... ... @@ -58,10 +58,16 @@
58 58   xDropdown.toggleClass('open');
59 59   setDropdownButtonTitle(dropDownButton);
60 60   });
61 - dropDownHeader.append($(this).contents()[0]);
62 - dropDownHeader.append(dropDownButton);
63 - $(this).prepend(dropDownHeader);
64 - $(dropDownHeader).next().addClass('xDropdown-menu');
61 + let dropDownContent = $(this).contents();
62 + // We put all the content of the entry in the header,
63 + // except for the last one which is the content of the dropdown. This dropdown stays where it is.
64 + for (let index = 0; index < dropDownContent.length - 1 ; index++) {
65 + let item = dropDownContent[index];
66 + dropDownHeader.append(item);
67 + }
68 + dropDownHeader.append(dropDownButton);
69 + $(this).prepend(dropDownHeader);
70 + $(dropDownHeader).next().addClass('xDropdown-menu');
65 65   });
66 66  
67 67   $('.menu-horizontal .xDropdown').each(function() {
XWiki.StyleSheetExtension[1]
Code
... ... @@ -204,12 +204,6 @@
204 204   padding: 0;
205 205   display: inherit;
206 206   }
207 - /* Place the arrow on the right */
208 - &:after {
209 - position: absolute;
210 - margin-top: @line-height-computed / 2;
211 - right: 8px;
212 - }
213 213   }
214 214   /* Separator horizontal inside menu */
215 215   &:empty {
XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,6 +1,7 @@
1 1  {{velocity}}
2 2  #set ($id = $xcontext.macro.params.id)
3 3  #set ($type = $xcontext.macro.params.type)
4 +#set ($label = $xcontext.macro.params.label)
4 4  #set ($colorTheme = $xwiki.getUserPreference('colorTheme'))
5 5  #if ("$!colorTheme" != '')
6 6   ## Make sure we use an absolute reference (see XWIKI-9672)
... ... @@ -8,12 +8,17 @@
8 8  #end
9 9  #set ($discard = $xwiki.ssx.use("$xcontext.macro.doc.prefixedFullName", {'colorTheme': $colorTheme}))
10 10  #set ($discard = $xwiki.jsx.use("$xcontext.macro.doc.prefixedFullName"))
12 +## Make sure the label is non-empty as otherwise the aria-label doesn't work.
13 +#if ("$!label" != '')
14 + #set ($label = $wikimacro.context.getXDOM().getIdGenerator().generateUniqueId('Menu',''))
15 +#end
11 11  #if($type.contains('horizontal'))
12 12   ## Make sure the id is non-empty for horizontal menus as otherwise the toggle doesn't work.
13 - #if ($stringtool.isBlank("$!id"))
18 + #if ("$!id" == '')
14 14   #set ($id = $wikimacro.context.getXDOM().getIdGenerator().generateUniqueId("M", "GeneratedMenuId"))
15 15   #end
16 - (% role="navigation" class="menu-horizontal-toggle" %)(((
21 + (% role='navigation' class='menu-horizontal-toggle'
22 + aria-label="${services.rendering.escape($label, 'xwiki/2.1')}" %)(((
17 17   (% class="navbar-header" %)(((
18 18   {{html}}
19 19   <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#$!{escapetool.xml($id)}" aria-expanded="false">
... ... @@ -24,12 +24,13 @@
24 24   </button>
25 25   {{/html}}
26 26   )))
27 - (% id="$!{services.rendering.escape($id, 'xwiki/2.1')}" class="menu menu-${services.rendering.escape($!type, 'xwiki/2.1')} collapse navbar-collapse" role="menubar" %)(((
33 + (% id="$!{services.rendering.escape($id, 'xwiki/2.1')}" class="menu menu-${services.rendering.escape($!type, 'xwiki/2.1')} collapse navbar-collapse" role="navigation" %)(((
28 28   {{wikimacrocontent/}}
29 29   )))
30 30   )))
31 31  #else
32 - (% #if ("$!id" != '') id="${services.rendering.escape($id, 'xwiki/2.1')}"#end class="menu menu-${services.rendering.escape($!type, 'xwiki/2.1')}" role="menu" %)(((
38 + (% role="navigation" #if ("$!id" != '') id="${services.rendering.escape($id, 'xwiki/2.1')}"#end class="menu menu-${services.rendering.escape($!type, 'xwiki/2.1')}"
39 + aria-label="${services.rendering.escape($label, 'xwiki/2.1')}" %)(((
33 33   {{wikimacrocontent/}}
34 34   )))
35 35  #end
XWiki.WikiMacroParameterClass[3]
Parameter description
... ... @@ -1,0 +1,1 @@
1 +Optional menu label used to describe the content of the menu.
Parameter mandatory
... ... @@ -1,0 +1,1 @@
1 +No
Parameter name
... ... @@ -1,0 +1,1 @@
1 +label