mnet: finish up UI for enrolment handling and hardcoded strings

diff --git a/admin/mnet/enr_course_enrol.html b/admin/mnet/enr_course_enrol.html
index af466d3f9f1151dcdf4c77ff1761100a367df072..7cb6546fced0759092d55291f48043c61eb22e6f 100755 (executable)
--- a/admin/mnet/enr_course_enrol.html
+++ b/admin/mnet/enr_course_enrol.html
@@ -90,12 +90,15 @@
     </tr>
     <tr>
       <td valign="top"><?php print_string('otherenrolledusers', 'mnet'); ?>:<br />
+          <ul>
           <?php
             foreach ($remtenrolledusers as $enrolleduser) {
                 $fullname = fullname($enrolleduser, true);
-                echo s($fullname) .', ('.s($enrolleduser->rolename) . ') '.s($enrolleduser->enroltype)."<br />\n";
+                print '<li>'
+                    . s($fullname) . ' (' . s($enrolleduser->rolename) . ') '
+                    . s($enrolleduser->enroltype)."</li>\n";
             }
-          ?></td>
+          ?></ul></td>
       <td valign="top"></td>
       <td valign="top"></td>
     </tr>

diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php
index c9584343031b98da622623fc511df25d86430370..4239f27748d536e876ede7058ba843c46335ea09 100644 (file)
--- 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('<strong>' . s($mnet_peer->name) . ' : ' 
+          . s($course->shortname) .' '. s($course->fullname) 
+          . '</strong><br />'
+          . get_string("enrolcourseenrol_desc", "mnet"));
 
 echo "<hr />";
 

diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php
index 94d6fffab9103b3f838117bd2cb306d809552b0e..1532c8cfd0ce833a5e621c8313a1486d04bbcf16 100644 (file)
--- 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('<strong>' . s($host->name) . ' </strong><br />'
+              . get_string("enrolcourses_desc", "mnet"));
 
     echo "<hr />";
 
@@ -34,7 +36,10 @@
             . "host={$mnethost}&amp;courseid={$course->id}&amp;sesskey={$USER->sesskey}";
         print ('<tr>'
                . "<td>$icon</td>"
-               . "<td ><a href=\"$link\">".s($course->shortname). '&nbsp;'.s($course->fullname). "</a></td>"
+               . "<td><a href=\"$link\">".s($course->fullname). "</a></td>"
+               . '</tr><tr>'
+               . '<td></td>'
+               . '<td>'.s($course->shortname). ' - ' .s($course->cat_name).'</td>'
                . '</tr><tr>'
                . '<td></td>'
                . "<td align=\"left\" >{$course->summary}</td>"

diff --git a/admin/mnet/enr_hosts.php b/admin/mnet/enr_hosts.php
index 8514a4d042263b0e257c4b774d4308f690e638d8..b880f630a54a5e6e5b01cb04468b18ecd9147365 100644 (file)
--- a/admin/mnet/enr_hosts.php
+++ b/admin/mnet/enr_hosts.php
@@ -28,12 +28,12 @@
         print_box(get_string('mnetdisabled','mnet'));
     }
 
-    print ('<table align="center">'
+    print ('<table align="center" cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >'
            . '<tr>'
-           . '<th> Host </th>'
-           . '<th> Enrolments </th>'
-           . '<th> Courses </th>'
-           . '<th> &nbsp; </th>'
+           . '<th class="header c0"> '.get_string('host', 'mnet').' </th>'
+           . '<th class="header c1"> '.get_string('enrolments', 'mnet').' </th>'
+           . '<th class="header c2"> '.get_string('courses', 'mnet').' </th>'
+           . '<th class="header c3"> &nbsp; </th>'
            . '</tr>');
     $hosts = $enrolment->list_remote_servers();
     foreach ($hosts as $host) {
@@ -47,8 +47,8 @@
         print ('<tr>'
                . "<td><a href=\"{$coursesurl}\">{$host->name}</a></td>"
                . "<td align=\"center\" >$enrolcount</td>"
-               . "<td align=\"center\" ><a href=\"{$coursesurl}\">$coursecount - edit</a></td>"
-               . '<td align="center" > <a href="">Logs</a> </td>'
+               . "<td align=\"center\" ><a href=\"{$coursesurl}\">$coursecount - ".get_string('editenrolments', 'mnet')."</a></td>"
+               . '<td align="center" > <a href="">'.get_string('logs', 'mnet').'</a> </td>'
                . '</tr>');
     }
     print ('</table>');

diff --git a/admin/settings/mnet.php b/admin/settings/mnet.php
index 535e0001b10eb78a0da1017e1e029511d0bb32e7..1f5e8c7c418238f0f26eafdeb48d3439c8d92177 100644 (file)
--- 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 5d1f34d03e3be7dd5229ddeeacb2b73886078f0f..37829e0b7e21cea896efb0e423964bd6bd4deab1 100644 (file)
--- 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']          = '<p>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 <strong>disabled</strong>.';
 $string['authmnetdisabled'] = 'Moodle Networking <em>Authentication plugin</em>is <strong>disabled</strong>.';
 $string['authmnetautoadddisabled'] = '<em>Auto-add users</em> in Moodle Networking Authentication plugin is <strong>disabled</strong>.';
+$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
+                                    <em>Other enrolled users</em>';
+$string['host'] = 'host';
 ?>