mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-53181-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
David Monllao 2016-03-29 09:50:52 +08:00
commit 497cd6d48b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/outputrenderers.php
View File

@ -3377,12 +3377,16 @@ EOD;
array('class' => 'iconsmall')
) . $value->title;
}
$al = new action_menu_link_secondary(
$value->url,
$pix,
$value->title,
array('class' => 'icon')
);
if (!empty($value->titleidentifier)) {
$al->attributes['data-title'] = $value->titleidentifier;
}
$am->add($al);
break;
}

7
user/lib.php
View File

@ -685,11 +685,13 @@ function user_convert_text_to_menu_items($text, $page) {
if (clean_param($namebits[0], PARAM_STRINGID) !== '') {
// Treat this as a language string.
$child->title = get_string($namebits[0], $namebits[1]);
$child->titleidentifier = implode(',', $namebits);
}
}
if (empty($child->title)) {
// Use it as is, don't even clean it.
$child->title = $bits[0];
$child->titleidentifier = str_replace(" ", "-", $bits[0]);
}
// URL processing.
@ -839,6 +841,7 @@ function user_get_user_navigation_info($user, $page, $options = array()) {
$myhome->itemtype = 'link';
$myhome->url = new moodle_url('/my/');
$myhome->title = get_string('mymoodle', 'admin');
$myhome->titleidentifier = 'mymoodle,admin';
$myhome->pix = "i/course";
$returnobject->navitems[] = $myhome;
@ -847,6 +850,7 @@ function user_get_user_navigation_info($user, $page, $options = array()) {
$myprofile->itemtype = 'link';
$myprofile->url = new moodle_url('/user/profile.php', array('id' => $user->id));
$myprofile->title = get_string('profile');
$myprofile->titleidentifier = 'profile,moodle';
$myprofile->pix = "i/user";
$returnobject->navitems[] = $myprofile;
@ -867,6 +871,7 @@ function user_get_user_navigation_info($user, $page, $options = array()) {
));
$rolereturn->pix = "a/logout";
$rolereturn->title = get_string('switchrolereturn');
$rolereturn->titleidentifier = 'switchrolereturn,moodle';
$lastobj = $rolereturn;
$returnobject->metadata['asotherrole'] = true;
@ -897,6 +902,7 @@ function user_get_user_navigation_info($user, $page, $options = array()) {
));
$userrevert->pix = "a/logout";
$userrevert->title = get_string('logout');
$userrevert->titleidentifier = 'logout,moodle';
$lastobj = $userrevert;
$buildlogout = false;
@ -909,6 +915,7 @@ function user_get_user_navigation_info($user, $page, $options = array()) {
$logout->url = new moodle_url('/login/logout.php', array('sesskey' => sesskey()));
$logout->pix = "a/logout";
$logout->title = get_string('logout');
$logout->titleidentifier = 'logout,moodle';
$lastobj = $logout;
}