From 94f630e33f9da2c178fc862c8c8569a7695f27ae Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Wed, 13 Jul 2011 16:47:05 +0200 Subject: [PATCH] MDL-28325 Enrolment: added help to the duration, start date and end date setting The patch also fixes one typo in enrol_manual detected while working on this. --- enrol/authorize/lang/en/enrol_authorize.php | 2 +- enrol/manual/edit_form.php | 1 + enrol/manual/lang/en/enrol_manual.php | 7 ++++--- enrol/paypal/edit_form.php | 5 +++-- enrol/paypal/lang/en/enrol_paypal.php | 7 +++++-- enrol/self/edit_form.php | 3 +++ enrol/self/lang/en/enrol_self.php | 7 +++++-- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/enrol/authorize/lang/en/enrol_authorize.php b/enrol/authorize/lang/en/enrol_authorize.php index 6250d2ef7c9..1f4d91e0376 100644 --- a/enrol/authorize/lang/en/enrol_authorize.php +++ b/enrol/authorize/lang/en/enrol_authorize.php @@ -256,7 +256,7 @@ $string['youcantdo'] = 'You can\'t do this action: {$a->action}'; $string['zipcode'] = 'Zip code'; $string['cost'] = 'Cost'; $string['currency'] = 'Currency'; -$string['enrolperiod'] = 'Enrolment period'; +$string['enrolperiod'] = 'Enrolment duration'; $string['enrolstartdate'] = 'Start date'; $string['enrolenddate'] = 'End date'; $string['enrolenddaterror'] = 'Enrolment end date cannot be earlier than start date'; diff --git a/enrol/manual/edit_form.php b/enrol/manual/edit_form.php index 9a4219e00d1..7ff2792d34b 100644 --- a/enrol/manual/edit_form.php +++ b/enrol/manual/edit_form.php @@ -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->setDefault('enrolperiod', $plugin->get_config('enrolperiod')); + $mform->addHelpButton('enrolperiod', 'defaultperiod', 'enrol_manual'); if ($instance->id) { $roles = get_default_enrol_roles($context, $instance->roleid); diff --git a/enrol/manual/lang/en/enrol_manual.php b/enrol/manual/lang/en/enrol_manual.php index aead38499c5..4d11100afec 100644 --- a/enrol/manual/lang/en/enrol_manual.php +++ b/enrol/manual/lang/en/enrol_manual.php @@ -27,10 +27,11 @@ $string['alterstatus'] = 'Alter status'; $string['altertimeend'] = 'Alter end 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['defaultperiod'] = 'Default enrolment period'; -$string['defaultperiod_desc'] = 'Default length of the default enrolment period setting (in seconds).'; //TODO: fixme +$string['defaultperiod'] = 'Default enrolment duration'; +$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['editenrolment'] = 'Edit enrolment'; $string['editselectedusers'] = 'Edit selected user enrolments'; diff --git a/enrol/paypal/edit_form.php b/enrol/paypal/edit_form.php index 8ee2147ad99..e2121d54a5b 100644 --- a/enrol/paypal/edit_form.php +++ b/enrol/paypal/edit_form.php @@ -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->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->setDefault('enrolstartdate', 0); - + $mform->addHelpButton('enrolstartdate', 'enrolstartdate', 'enrol_paypal'); $mform->addElement('date_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_paypal'), array('optional' => true)); $mform->setDefault('enrolenddate', 0); + $mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_paypal'); $mform->addElement('hidden', 'id'); $mform->addElement('hidden', 'courseid'); diff --git a/enrol/paypal/lang/en/enrol_paypal.php b/enrol/paypal/lang/en/enrol_paypal.php index 9f8030aa9f4..211b9a80991 100644 --- a/enrol/paypal/lang/en/enrol_paypal.php +++ b/enrol/paypal/lang/en/enrol_paypal.php @@ -34,10 +34,13 @@ $string['currency'] = 'Currency'; $string['defaultrole'] = 'Default role assignment'; $string['defaultrole_desc'] = 'Select role which should be assigned to users during PayPal enrolments'; $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['enrolperiod'] = 'Enrolment period'; -$string['enrolperiod_desc'] = 'Default length of the enrolment period (in seconds).'; //TODO: fixme +$string['enrolperiod'] = 'Enrolment duration'; +$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_help'] = 'If enabled, users can be enrolled from this date onward only.'; $string['mailadmins'] = 'Notify admin'; $string['mailstudents'] = 'Notify students'; $string['mailteachers'] = 'Notify teachers'; diff --git a/enrol/self/edit_form.php b/enrol/self/edit_form.php index 3141f5eab57..338ccb6cd57 100644 --- a/enrol/self/edit_form.php +++ b/enrol/self/edit_form.php @@ -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->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->setDefault('enrolstartdate', 0); + $mform->addHelpButton('enrolstartdate', 'enrolstartdate', 'enrol_self'); $mform->addElement('date_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_self'), array('optional' => true)); $mform->setDefault('enrolenddate', 0); + $mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_self'); $options = array(0 => get_string('never'), 1800 * 3600 * 24 => get_string('numdays', '', 1800), diff --git a/enrol/self/lang/en/enrol_self.php b/enrol/self/lang/en/enrol_self.php index f32a3668cb6..14a62f8c35c 100644 --- a/enrol/self/lang/en/enrol_self.php +++ b/enrol/self/lang/en/enrol_self.php @@ -29,11 +29,14 @@ $string['defaultrole'] = 'Default role assignment'; $string['defaultrole_desc'] = 'Select role which should be assigned to users during self enrolment'; $string['editenrolment'] = 'Edit enrolment'; $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['enrolme'] = 'Enrol me'; -$string['enrolperiod'] = 'Enrolment period'; -$string['enrolperiod_desc'] = 'Default length of the enrolment period (in seconds).'; //TODO: fixme +$string['enrolperiod'] = 'Enrolment duration'; +$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_help'] = 'If enabled, users can enrol themselves from this date onward only.'; $string['groupkey'] = 'Use group enrolment keys'; $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.