moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-28325 Enrolment: added help to the duration, start date and end date setting

Browse source 
The patch also fixes one typo in enrol_manual detected while working on
this.
This commit is contained in:
David Mudrak 2011-07-13 16:47:05 +02:00
parent ecb8829273
commit 94f630e33f
7 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
enrol/authorize/lang/en/enrol_authorize.php
View file

@ -256,7 +256,7 @@ $string['youcantdo'] = 'You can\'t do this action: {$a->action}';
$string['zipcode'] = 'Zip code'; $string['zipcode'] = 'Zip code';
$string['cost'] = 'Cost'; $string['cost'] = 'Cost';
$string['currency'] = 'Currency'; $string['currency'] = 'Currency';
$string['enrolperiod'] = 'Enrolment period'; $string['enrolperiod'] = 'Enrolment duration';
$string['enrolstartdate'] = 'Start date'; $string['enrolstartdate'] = 'Start date';
$string['enrolenddate'] = 'End date'; $string['enrolenddate'] = 'End date';
$string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date'; $string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date';

1
enrol/manual/edit_form.php
View file

@ -46,6 +46,7 @@ class enrol_manual_edit_form extends moodleform {
$mform->addElement('duration', 'enrolperiod', get_string('defaultperiod', 'enrol_manual'), array('optional' => true, 'defaultunit' => 86400)); $mform->addElement('duration', 'enrolperiod', get_string('defaultperiod', 'enrol_manual'), array('optional' => true, 'defaultunit' => 86400));
$mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod')); $mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod'));
$mform->addHelpButton('enrolperiod', 'defaultperiod', 'enrol_manual');
if ($instance->id) { if ($instance->id) {
$roles = get_default_enrol_roles($context, $instance->roleid); $roles = get_default_enrol_roles($context, $instance->roleid);

7
enrol/manual/lang/en/enrol_manual.php
View file

@ -27,10 +27,11 @@
$string['alterstatus'] = 'Alter status'; $string['alterstatus'] = 'Alter status';
$string['altertimeend'] = 'Alter end time'; $string['altertimeend'] = 'Alter end time';
$string['altertimestart'] = 'Alter start time'; $string['altertimestart'] = 'Alter start time';
$string['assignrole'] = 'Assignrole'; $string['assignrole'] = 'Assign role';
$string['confirmbulkdeleteenrolment'] = 'Are you sure you want to delete these users enrolments?'; $string['confirmbulkdeleteenrolment'] = 'Are you sure you want to delete these users enrolments?';
$string['defaultperiod'] = 'Default enrolment period'; $string['defaultperiod'] = 'Default enrolment duration';
$string['defaultperiod_desc'] = 'Default length of the default enrolment period setting (in seconds).'; //TODO: fixme $string['defaultperiod_desc'] = 'Default length of time that the enrolment is valid (in seconds). If set to zero, the enrolment duration will be unlimited by default.';
$string['defaultperiod_help'] = 'Default length of time that the enrolment is valid, starting with the moment the user is enrolled. If disabled, the enrolment duration will be unlimited by default.';
$string['deleteselectedusers'] = 'Delete selected user enrolments'; $string['deleteselectedusers'] = 'Delete selected user enrolments';
$string['editenrolment'] = 'Edit enrolment'; $string['editenrolment'] = 'Edit enrolment';
$string['editselectedusers'] = 'Edit selected user enrolments'; $string['editselectedusers'] = 'Edit selected user enrolments';

5
enrol/paypal/edit_form.php
View file

@ -69,14 +69,15 @@ class enrol_paypal_edit_form extends moodleform {
$mform->addElement('duration', 'enrolperiod', get_string('enrolperiod', 'enrol_paypal'), array('optional' => true, 'defaultunit' => 86400)); $mform->addElement('duration', 'enrolperiod', get_string('enrolperiod', 'enrol_paypal'), array('optional' => true, 'defaultunit' => 86400));
$mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod')); $mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod'));
$mform->addHelpButton('enrolperiod', 'enrolperiod', 'enrol_paypal');
$mform->addElement('date_selector', 'enrolstartdate', get_string('enrolstartdate', 'enrol_paypal'), array('optional' => true)); $mform->addElement('date_selector', 'enrolstartdate', get_string('enrolstartdate', 'enrol_paypal'), array('optional' => true));
$mform->setDefault('enrolstartdate', 0); $mform->setDefault('enrolstartdate', 0);
$mform->addHelpButton('enrolstartdate', 'enrolstartdate', 'enrol_paypal');
$mform->addElement('date_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_paypal'), array('optional' => true)); $mform->addElement('date_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_paypal'), array('optional' => true));
$mform->setDefault('enrolenddate', 0); $mform->setDefault('enrolenddate', 0);
$mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_paypal');
$mform->addElement('hidden', 'id'); $mform->addElement('hidden', 'id');
$mform->addElement('hidden', 'courseid'); $mform->addElement('hidden', 'courseid');

7
enrol/paypal/lang/en/enrol_paypal.php
View file

@ -34,10 +34,13 @@ $string['currency'] = 'Currency';
$string['defaultrole'] = 'Default role assignment'; $string['defaultrole'] = 'Default role assignment';
$string['defaultrole_desc'] = 'Select role which should be assigned to users during PayPal enrolments'; $string['defaultrole_desc'] = 'Select role which should be assigned to users during PayPal enrolments';
$string['enrolenddate'] = 'End date'; $string['enrolenddate'] = 'End date';
$string['enrolenddate_help'] = 'If enabled, users can be enrolled until this date only.';
$string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date'; $string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date';
$string['enrolperiod'] = 'Enrolment period'; $string['enrolperiod'] = 'Enrolment duration';
$string['enrolperiod_desc'] = 'Default length of the enrolment period (in seconds).'; //TODO: fixme $string['enrolperiod_desc'] = 'Default length of time that the enrolment is valid (in seconds). If set to zero, the enrolment duration will be unlimited by default.';
$string['enrolperiod_help'] = 'Length of time that the enrolment is valid, starting with the moment the user is enrolled. If disabled, the enrolment duration will be unlimited.';
$string['enrolstartdate'] = 'Start date'; $string['enrolstartdate'] = 'Start date';
$string['enrolstartdate_help'] = 'If enabled, users can be enrolled from this date onward only.';
$string['mailadmins'] = 'Notify admin'; $string['mailadmins'] = 'Notify admin';
$string['mailstudents'] = 'Notify students'; $string['mailstudents'] = 'Notify students';
$string['mailteachers'] = 'Notify teachers'; $string['mailteachers'] = 'Notify teachers';

3
enrol/self/edit_form.php
View file

@ -68,12 +68,15 @@ class enrol_self_edit_form extends moodleform {
$mform->addElement('duration', 'enrolperiod', get_string('enrolperiod', 'enrol_self'), array('optional' => true, 'defaultunit' => 86400)); $mform->addElement('duration', 'enrolperiod', get_string('enrolperiod', 'enrol_self'), array('optional' => true, 'defaultunit' => 86400));
$mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod')); $mform->setDefault('enrolperiod', $plugin->get_config('enrolperiod'));
$mform->addHelpButton('enrolperiod', 'enrolperiod', 'enrol_self');
$mform->addElement('date_selector', 'enrolstartdate', get_string('enrolstartdate', 'enrol_self'), array('optional' => true)); $mform->addElement('date_selector', 'enrolstartdate', get_string('enrolstartdate', 'enrol_self'), array('optional' => true));
$mform->setDefault('enrolstartdate', 0); $mform->setDefault('enrolstartdate', 0);
$mform->addHelpButton('enrolstartdate', 'enrolstartdate', 'enrol_self');
$mform->addElement('date_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_self'), array('optional' => true)); $mform->addElement('date_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_self'), array('optional' => true));
$mform->setDefault('enrolenddate', 0); $mform->setDefault('enrolenddate', 0);
$mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_self');
$options = array(0 => get_string('never'), $options = array(0 => get_string('never'),
1800 * 3600 * 24 => get_string('numdays', '', 1800), 1800 * 3600 * 24 => get_string('numdays', '', 1800),

7
enrol/self/lang/en/enrol_self.php
View file

@ -29,11 +29,14 @@ $string['defaultrole'] = 'Default role assignment';
$string['defaultrole_desc'] = 'Select role which should be assigned to users during self enrolment'; $string['defaultrole_desc'] = 'Select role which should be assigned to users during self enrolment';
$string['editenrolment'] = 'Edit enrolment'; $string['editenrolment'] = 'Edit enrolment';
$string['enrolenddate'] = 'End date'; $string['enrolenddate'] = 'End date';
$string['enrolenddate_help'] = 'If enabled, users can enrol themselves until this date only.';
$string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date'; $string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date';
$string['enrolme'] = 'Enrol me'; $string['enrolme'] = 'Enrol me';
$string['enrolperiod'] = 'Enrolment period'; $string['enrolperiod'] = 'Enrolment duration';
$string['enrolperiod_desc'] = 'Default length of the enrolment period (in seconds).'; //TODO: fixme $string['enrolperiod_desc'] = 'Default length of time that the enrolment is valid (in seconds). If set to zero, the enrolment duration will be unlimited by default.';
$string['enrolperiod_help'] = 'Length of time that the enrolment is valid, starting with the moment the user enrols themselves. If disabled, the enrolment duration will be unlimited.';
$string['enrolstartdate'] = 'Start date'; $string['enrolstartdate'] = 'Start date';
$string['enrolstartdate_help'] = 'If enabled, users can enrol themselves from this date onward only.';
$string['groupkey'] = 'Use group enrolment keys'; $string['groupkey'] = 'Use group enrolment keys';
$string['groupkey_desc'] = 'Use group enrolment keys by default.'; $string['groupkey_desc'] = 'Use group enrolment keys by default.';
$string['groupkey_help'] = 'In addition to restricting access to the course to only those who know the key, use of a group enrolment key means users are automatically added to the group when they enrol in the course. $string['groupkey_help'] = 'In addition to restricting access to the course to only those who know the key, use of a group enrolment key means users are automatically added to the group when they enrol in the course.