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

Merge branch 'MDL-47576-master' of git://github.com/jethac/moodle

Browse source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2014-10-15 16:59:06 +01:00
commit 529e38d141
3 changed files with 266 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/outputrenderers.php
View file

@ -3040,10 +3040,9 @@ EOD;
$am = new action_menu();
$am->initialise_js($this->page);
$am->set_menu_trigger(html_writer::span(
get_string('usermenu', 'moodle'),
"accesshide"
));
$am->set_menu_trigger(
$returnstr
);
$am->set_alignment(action_menu::TR, action_menu::BR);
if ($withlinks) {
$navitemcount = count($opts->navitems);
@ -3072,10 +3071,6 @@ EOD;
}
return html_writer::div(
html_writer::div(
$returnstr,
'userinfo'
) .
$this->render($am),
$usermenuclasses
);