L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-49849-master' of git://github.com/gurgus/moodle

Browse Source
This commit is contained in:
David Monllao
2015-04-22 14:40:37 +08:00
parent e28767f414 f13a911317
commit ac0f0f9dd9
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/moodle.php
+1
View File
@@ -1048,6 +1048,7 @@ $string['loggedinas'] = 'You are logged in as {$a}';
$string['loggedinasguest'] = 'You are currently using guest access';
$string['loggedinnot'] = 'You are not logged in.';
$string['login'] = 'Log in';
$string['loginactivity'] = 'Login activity';
$string['loginalready'] = 'You are already logged in';
$string['loginas'] = 'Log in as';
$string['loginaspasswordexplain'] = '<p>You must enter the special "loginas password" to use this feature.<br />If you do not know it, ask your server administrator.</p>';
lib/myprofilelib.php
+9 -7
View File
@@ -43,17 +43,19 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
$courseid = !empty($course) ? $course->id : SITEID;
$contactcategory = new core_user\output\myprofile\category('contact', get_string('userdetails'));
$miscategory = new core_user\output\myprofile\category('miscellaneous', get_string('miscellaneous'));
$reportcategory = new core_user\output\myprofile\category('reports', get_string('reports'), 'miscellaneous');
$admincategory = new core_user\output\myprofile\category('administration', get_string('administration'), 'miscellaneous');
$coursedetailscategory = new core_user\output\myprofile\category('coursedetails', get_string('coursedetails'), 'contact');
$miscategory = new core_user\output\myprofile\category('miscellaneous', get_string('miscellaneous'), 'coursedetails');
$reportcategory = new core_user\output\myprofile\category('reports', get_string('reports'), 'miscellaneous');
$admincategory = new core_user\output\myprofile\category('administration', get_string('administration'), 'reports');
$loginactivitycategory = new core_user\output\myprofile\category('loginactivity', get_string('loginactivity'), 'administration');
// Add categories.
$tree->add_category($contactcategory);
$tree->add_category($coursedetailscategory);
$tree->add_category($miscategory);
$tree->add_category($reportcategory);
$tree->add_category($admincategory);
$tree->add_category($coursedetailscategory);
$tree->add_category($loginactivitycategory);
// Add core nodes.
// Full profile node.
@@ -386,7 +388,7 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
} else {
$datestring = get_string("never");
}
$node = new core_user\output\myprofile\node('miscellaneous', 'firstaccess', get_string('firstsiteaccess'), null, null,
$node = new core_user\output\myprofile\node('loginactivity', 'firstaccess', get_string('firstsiteaccess'), null, null,
$datestring);
$tree->add_node($node);
}
@@ -409,7 +411,7 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
}
}
$node = new core_user\output\myprofile\node('miscellaneous', 'lastaccess', $string, null, null,
$node = new core_user\output\myprofile\node('loginactivity', 'lastaccess', $string, null, null,
$datestring);
$tree->add_node($node);
}
@@ -422,7 +424,7 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
} else {
$ipstring = get_string("none");
}
$node = new core_user\output\myprofile\node('miscellaneous', 'lastip', get_string('lastip'), null, null,
$node = new core_user\output\myprofile\node('loginactivity', 'lastip', get_string('lastip'), null, null,
$ipstring);
$tree->add_node($node);
}