Merged some fixes for MDL-8285 from stable

diff --git a/enrol/database/config.html b/enrol/database/config.html
index ca2726c49fa4a51a3fee2e8ed6049fdd55b17654..29cc2f603d9eb4faa2f0836003c249d29cde3c64 100644 (file)
--- a/enrol/database/config.html
+++ b/enrol/database/config.html
@@ -80,7 +80,7 @@
 </tr>
 <tr>
     <th colspan="2" scope="col">
-        <?php print_string("field_mapping", "enrol_database") ?>
+        <?php print_string("remote_fields_mapping", "enrol_database") ?>
     </th>
 </tr>
 <tr>
@@ -207,9 +207,5 @@
     <?php  print_string("template","enrol_database") ?>
     </td>
 </tr>
-<tr>
-    <td colspan="2">
-        <?php print_string("general_options", "enrol_database") ?>
-    </td>
-</tr>
+
 </table>

diff --git a/lang/en_utf8/enrol_database.php b/lang/en_utf8/enrol_database.php
index e94ada57bfb928f3752f100f6a33151f1d7a7180..f12e986fad863178cd8fc0102dd8f615a1eebc96 100644 (file)
--- a/lang/en_utf8/enrol_database.php
+++ b/lang/en_utf8/enrol_database.php
@@ -9,15 +9,28 @@ $string['course_fullname'] = 'The name of the field where the course fullname is
 $string['course_id'] = 'The name of the field where the course ID is stored. The values of this field are used to match those in the \"enrol_db_l_coursefield\" field in Moodle\'s course table.';
 $string['course_shortname'] = 'The name of the field where the course shortname is stored.';
 $string['course_table'] = 'Then name of the table where we expect to find the course details in (short name, fullname, ID, etc.)';
+$string['dbtype'] = 'Database type';
+$string['dbhost'] = 'Server IP name or number';
+$string['dbuser'] = 'Server user';
+$string['dbpass'] = 'Server password';
+$string['dbname'] = 'Database name';
+$string['dbtable'] = 'Database table';
+$string['defaultcourseroleid'] = 'The role that will be assigned by default if no other role is specified.';
 $string['description'] = 'You can use a external database (of nearly any kind) to control your enrolments. It is assumed your external database contains a field containing a course ID, and a field containing a user ID. These are compared against fields that you choose in the local course and user tables.';
 $string['enrolname'] = 'External Database';
+$string['enrol_database_autocreation_settings'] = 'Auto-creation of new courses';
 $string['general_options'] = 'General Options';
 $string['host'] = 'Database server hostname.';
-$string['local_coursefield'] = 'The name of the field in the course table that we are using to match entries in the remote database (eg idnumber).';
+$string['localcoursefield'] = 'The name of the field in the course table that we are using to match entries in the remote database (eg idnumber).';
+$string['localrolefield'] = 'The name of the field in the roles table that we are using to match entries in the remote database (eg shortname).';
+$string['localuserfield'] = 'The name of the field in the user table that we are using to match entries in the remote database (eg idnumber).';
 $string['local_fields_mapping'] = 'Moodle (local) database fields';
 $string['name'] = 'The specific database to use.';
 $string['pass'] = 'Password to access the server.';
 $string['remote_fields_mapping'] = 'Enrolment (remote) database fields.';
+$string['remotecoursefield'] = 'The name of the field in the remote table that we are using to match entries in the course table.';
+$string['remoterolefield'] = 'The name of the field in the remote table that we are using to match entries in the roles table.';
+$string['remoteuserfield'] = 'The name of the field in the remote table that we are using to match entries in the user table.';
 $string['server_settings'] = 'External Database Server Settings';
 $string['student_coursefield'] = 'The name of the field in the student enrolment table that we expect to find the course ID in.';
 $string['student_l_userfield'] = 'The name of the field in the local user table that we use to match the user to a remote record for students (eg idnumber).';

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index c6518dea25009be2ba225c0665eab5fe8eb909fb..8494a7e9465f44d2fbda8ef790c0b2b98053e85e 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -208,6 +208,7 @@ img.grouppicture {
 .informationbox {
   border-width:1px;
   border-style:solid;
+  padding: 10px;
 }
 
 .feedbackbox {