Merge branch 'MDL-39063' of github.com:totara/openbadges

Conflicts:
	admin/settings/badges.php
	lib/db/upgrade.php
	version.php
This commit is contained in:
Dan Poltawski
2013-04-16 12:00:46 +01:00
17 changed files with 507 additions and 273 deletions
+9
View File
@@ -4063,6 +4063,15 @@ class settings_navigation extends navigation_node {
}
}
// Badges.
if ($currentuser && !empty($CFG->enablebadges)) {
$badges = $usersetting->add(get_string('badges'), null, navigation_node::TYPE_CONTAINER, null, 'badges');
$badges->add(get_string('preferences'), new moodle_url('/badges/preferences.php'), navigation_node::TYPE_SETTING);
if (!empty($CFG->badges_allowexternalbackpack)) {
$badges->add(get_string('backpackdetails', 'badges'), new moodle_url('/badges/mybackpack.php'), navigation_node::TYPE_SETTING);
}
}
// Add reports node.
$reporttab = $usersetting->add(get_string('activityreports'));
$reports = get_plugin_list_with_function('report', 'extend_navigation_user', 'lib.php');