moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-62139 output: Revert template changes

Browse source 
Revert accessibility changes for menus in standard themes.
This commit is contained in:
Damyon Wiese 2018-10-23 15:27:34 +08:00
parent 17f5816739
commit cd786f0d0d
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/templates/action_menu_trigger.mustache
View file

@ -27,4 +27,4 @@
"triggerextraclasses": "" "triggerextraclasses": ""
} }
}} }}
<a tabindex="0" class="{{triggerextraclasses}} toggle-display {{#menutrigger}}textmenu{{/menutrigger}}" id="action-menu-toggle-{{instance}}" aria-label="{{title}}" role="menuitem" aria-controls="action-menu-{{instance}}-menu">{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}<b class="caret"></b>{{/menutrigger}}</a> <a href="#" class="{{triggerextraclasses}} toggle-display {{#menutrigger}}textmenu{{/menutrigger}}" id="action-menu-toggle-{{instance}}" title="{{title}}" role="menuitem">{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}<b class="caret"></b>{{/menutrigger}}</a>

3
lib/tests/user_menu_test.php
View file

@ -96,8 +96,7 @@ test
$dividercount += 2; $dividercount += 2;
// The basic entry count will additionally include the wrapper menu, Dashboard, Profile, Logout and switch roles link. // The basic entry count will additionally include the wrapper menu, Dashboard, Profile, Logout and switch roles link.
// On clean theme only, the trigger is also a menuitem. $entrycount += 4;
$entrycount += 5;
$output = $OUTPUT->user_menu($USER); $output = $OUTPUT->user_menu($USER);
preg_match_all('/<a [^>]+role="menuitem"[^>]+>/', $output, $results); preg_match_all('/<a [^>]+role="menuitem"[^>]+>/', $output, $results);