diff --git a/admin/mnet/enr_course_enrol.html b/admin/mnet/enr_course_enrol.html
index af466d3f9f1..7cb6546fced 100755
--- a/admin/mnet/enr_course_enrol.html
+++ b/admin/mnet/enr_course_enrol.html
@@ -90,12 +90,15 @@
:
+
rolename) . ') '.s($enrolleduser->enroltype)." \n";
+ print '- '
+ . s($fullname) . ' (' . s($enrolleduser->rolename) . ') '
+ . s($enrolleduser->enroltype)."
\n";
}
- ?> |
+ ?>
|
|
diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php
index c9584343031..4239f27748d 100644
--- a/admin/mnet/enr_course_enrol.php
+++ b/admin/mnet/enr_course_enrol.php
@@ -253,8 +253,10 @@ $strsearchresults = get_string('searchresults');
admin_externalpage_print_header($adminroot);
-print_string('enrollingincourse', 'mnet', array(s($course->shortname), s($mnet_peer->name)));
-print_string("description", "enrol_mnet");
+print_box('' . s($mnet_peer->name) . ' : '
+ . s($course->shortname) .' '. s($course->fullname)
+ . '
'
+ . get_string("enrolcourseenrol_desc", "mnet"));
echo "
";
diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php
index 94d6fffab91..1532c8cfd0c 100644
--- a/admin/mnet/enr_courses.php
+++ b/admin/mnet/enr_courses.php
@@ -13,6 +13,7 @@
$enrolment = enrolment_factory::factory('mnet');
$mnethost = required_param('host', PARAM_INT);
+ $host = get_record('mnet_host', 'id', $mnethost);
$courses = $enrolment->fetch_remote_courses($mnethost);
@@ -20,7 +21,8 @@
admin_externalpage_print_header($adminroot);
- print_box(get_string("description", "enrol_mnet"));
+ print_box('' . s($host->name) . '
'
+ . get_string("enrolcourses_desc", "mnet"));
echo "
";
@@ -34,7 +36,10 @@
. "host={$mnethost}&courseid={$course->id}&sesskey={$USER->sesskey}";
print (''
. "| $icon | "
- . "".s($course->shortname). ' '.s($course->fullname). " | "
+ . "".s($course->fullname). " | "
+ . '
'
+ . ' | '
+ . ''.s($course->shortname). ' - ' .s($course->cat_name).' | '
. '
'
. ' | '
. "{$course->summary} | "
diff --git a/admin/mnet/enr_hosts.php b/admin/mnet/enr_hosts.php
index 8514a4d0422..b880f630a54 100644
--- a/admin/mnet/enr_hosts.php
+++ b/admin/mnet/enr_hosts.php
@@ -28,12 +28,12 @@
print_box(get_string('mnetdisabled','mnet'));
}
- print (''
+ print ('');
diff --git a/admin/settings/mnet.php b/admin/settings/mnet.php
index 535e0001b10..1f5e8c7c418 100644
--- a/admin/settings/mnet.php
+++ b/admin/settings/mnet.php
@@ -2,10 +2,20 @@
// This file defines settingpages and externalpages under the "mnet" category
-$ADMIN->add('mnet', new admin_externalpage('net', get_string('settings', 'mnet'), $CFG->wwwroot . '/admin/mnet/index.php', 'moodle/site:config'));
-$ADMIN->add('mnet', new admin_externalpage('ssoaccesscontrol', get_string('ssoaccesscontrol', 'mnet'), $CFG->wwwroot . '/admin/mnet/access_control.php', 'moodle/site:config'));
+$ADMIN->add('mnet', new admin_externalpage('net', get_string('settings', 'mnet'),
+ $CFG->wwwroot . '/admin/mnet/index.php',
+ 'moodle/site:config'));
-$ADMIN->add('mnet', new admin_externalpage('mnetpeers', get_string('mnetpeers', 'mnet'), $CFG->wwwroot . '/admin/mnet/peers.php', 'moodle/site:config'));
-$ADMIN->add('mnet', new admin_externalpage('mnetenrol', get_string('mnetenrol', 'mnet'), $CFG->wwwroot . '/admin/mnet/enr_hosts.php', 'moodle/site:config'));
-$ADMIN->add('mnet', new admin_externalpage('trustedhosts', get_string('trustedhosts', 'mnet'), $CFG->wwwroot . '/admin/mnet/trustedhosts.php', 'moodle/site:config'));
+$ADMIN->add('mnet', new admin_externalpage('mnetpeers', get_string('mnetpeers', 'mnet'),
+ $CFG->wwwroot . '/admin/mnet/peers.php',
+ 'moodle/site:config'));
+$ADMIN->add('mnet', new admin_externalpage('ssoaccesscontrol', get_string('ssoaccesscontrol', 'mnet'),
+ $CFG->wwwroot . '/admin/mnet/access_control.php',
+ 'moodle/site:config'));
+$ADMIN->add('mnet', new admin_externalpage('mnetenrol', get_string('mnetenrol', 'mnet'),
+ $CFG->wwwroot . '/admin/mnet/enr_hosts.php',
+ 'moodle/site:config'));
+$ADMIN->add('mnet', new admin_externalpage('trustedhosts', get_string('trustedhosts', 'mnet'),
+ $CFG->wwwroot . '/admin/mnet/trustedhosts.php',
+ 'moodle/site:config'));
?>
diff --git a/lang/en_utf8/mnet.php b/lang/en_utf8/mnet.php
index 5d1f34d03e3..37829e0b7e2 100644
--- a/lang/en_utf8/mnet.php
+++ b/lang/en_utf8/mnet.php
@@ -7,9 +7,9 @@ $string['yourhost'] = 'Your Host';
$string['yourpeers'] = 'Your Peers';
$string['settings'] = 'Settings';
$string['hostsettings'] = 'Host Settings';
-$string['mnetpeers'] = 'Moodle network peers';
+$string['mnetpeers'] = 'Peers';
$string['mnetservices'] = 'Moodle network services';
-$string['trustedhosts'] = 'Trusted Hosts for XML-RPC';
+$string['trustedhosts'] = 'XML-RPC hosts';
$string['trustedhostsexplain'] = 'The trusted hosts mechanism allows specific machines to
execute calls via XML-RPC to any part of the Moodle API. This
available for scripts to control Moodle behaviour and can be
@@ -210,4 +210,20 @@ $string['ssoaclneeds'] = 'For this functionality to work, you must have Moodle N
$string['mnetdisabled'] = 'Moodle Network is disabled.';
$string['authmnetdisabled'] = 'Moodle Networking Authentication pluginis disabled.';
$string['authmnetautoadddisabled'] = 'Auto-add users in Moodle Networking Authentication plugin is disabled.';
+$string['mnetenrol'] = 'Enrolments';
+$string['remoteenrolhosts_desc'] = 'Enrol and unenrol users from your Moodle installation
+ on Moodle Hosts that allow you to do so via the Moodle
+ Network enrolment plugin.';
+$string['host'] = 'host';
+$string['enrolments'] = 'enrolments';
+$string['editenrolments'] = 'enrol';
+$string['logs'] = 'logs';
+$string['courses'] = 'courses';
+
+$string['enrolcourses_desc'] = 'Courses offered for remote enrolment by this host.';
+$string['enrolcourseenrol_desc'] = 'Enrol/unenrol users from this course using Moodle Network enrolments.
+ Note that users may have been enrolled in this course via other enrolment
+ methods if the remote hosts allows them. Such enrolments are listed under
+ Other enrolled users';
+$string['host'] = 'host';
?>