diff --git a/enrol/guest/lang/en/enrol_guest.php b/enrol/guest/lang/en/enrol_guest.php index bf8348ac29976..d936f266702c8 100644 --- a/enrol/guest/lang/en/enrol_guest.php +++ b/enrol/guest/lang/en/enrol_guest.php @@ -31,12 +31,13 @@ (Here\'s a hint - it starts with \'{$a}\')'; $string['pluginname'] = 'Guest access'; $string['pluginname_desc'] = 'Guest access plugin is only granting temporary access to courses, it is not actually enrolling users.'; -$string['pluginname_help'] = 'Guest access is "read-only" access to the course, meaning guests cannot post in a forum, edit a wiki, add glossary or database activity entries or otherwise mess up the course.'; $string['requirepassword'] = 'Require guest access password'; $string['requirepassword_desc'] = 'Require access password in new courses and prevent removing of access password from existing courses.'; $string['showhint'] = 'Show hint'; $string['showhint_desc'] = 'Show first letter of the guest access password.'; $string['status'] = 'Allow guest access'; $string['status_desc'] = 'Allow temporary guest access by default.'; +$string['status_help'] = 'This setting determines whether a user can access the course as a guest, without being required to enrol.'; +$string['status_link'] = 'enrol/guest'; $string['usepasswordpolicy'] = 'Use password policy'; $string['usepasswordpolicy_desc'] = 'Use standard password policy for guest access passwords.'; diff --git a/enrol/guest/lib.php b/enrol/guest/lib.php index 6d832911be9a2..ea37f24cc6ba5 100644 --- a/enrol/guest/lib.php +++ b/enrol/guest/lib.php @@ -148,6 +148,7 @@ public function course_edit_form($instance, MoodleQuickForm $mform, $data, $cont $options = array(ENROL_INSTANCE_ENABLED => get_string('yes'), ENROL_INSTANCE_DISABLED => get_string('no')); $mform->addElement('select', 'enrol_guest_status_'.$i, get_string('status', 'enrol_guest'), $options); + $mform->addHelpButton('enrol_guest_status_'.$i, 'status', 'enrol_guest'); $mform->setDefault('enrol_guest_status_'.$i, $this->get_config('status')); $mform->setAdvanced('enrol_guest_status_'.$i, $this->get_config('status_adv')); if (!$config) { @@ -155,6 +156,7 @@ public function course_edit_form($instance, MoodleQuickForm $mform, $data, $cont } $mform->addElement('passwordunmask', 'enrol_guest_password_'.$i, get_string('password', 'enrol_guest')); + $mform->addHelpButton('enrol_guest_password_'.$i, 'password', 'enrol_guest'); if (!$config) { $mform->hardFreeze('enrol_guest_password_'.$i); } else { diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php index 9dbc89e5f96a7..2fc7f8da60495 100644 --- a/enrol/manual/lib.php +++ b/enrol/manual/lib.php @@ -118,6 +118,7 @@ public function course_edit_form($instance, MoodleQuickForm $mform, $data, $cont $options = array(ENROL_INSTANCE_ENABLED => get_string('yes'), ENROL_INSTANCE_DISABLED => get_string('no')); $mform->addElement('select', 'enrol_manual_status_'.$i, get_string('status', 'enrol_manual'), $options); + $mform->addHelpButton('enrol_manual_status_'.$i, 'status', 'enrol_manual'); $mform->setDefault('enrol_manual_status_'.$i, $this->get_config('status')); $mform->setAdvanced('enrol_manual_status_'.$i, $this->get_config('status_adv')); if (!$config) { diff --git a/enrol/self/lang/en/enrol_self.php b/enrol/self/lang/en/enrol_self.php index 15edcc8013a95..bdf65cddaecc6 100644 --- a/enrol/self/lang/en/enrol_self.php +++ b/enrol/self/lang/en/enrol_self.php @@ -60,7 +60,7 @@ $string['showhint_desc'] = 'Show first letter of the guest access key.'; $string['status'] = 'Allow self enrolments'; $string['status_desc'] = 'Allow users to self enrol into course by default.'; -$string['status_help'] = 'This setting determines whether a user can enrol (and unenrol) themselves from the course.'; +$string['status_help'] = 'This setting determines whether a user can enrol (and also unenrol if they have the appropriate permission) themselves from the course.'; $string['unenrolselfconfirm'] = 'Do you really want to unenrol yourself from course "{$a}"?'; $string['usepasswordpolicy'] = 'Use password policy'; $string['usepasswordpolicy_desc'] = 'Use standard password policy for enrolment keys.'; diff --git a/enrol/self/lib.php b/enrol/self/lib.php index f4bc527cd748d..77ca9e6d2c867 100644 --- a/enrol/self/lib.php +++ b/enrol/self/lib.php @@ -165,6 +165,7 @@ public function course_edit_form($instance, MoodleQuickForm $mform, $data, $cont $options = array(ENROL_INSTANCE_ENABLED => get_string('yes'), ENROL_INSTANCE_DISABLED => get_string('no')); $mform->addElement('select', 'enrol_self_status_'.$i, get_string('status', 'enrol_self'), $options); + $mform->addHelpButton('enrol_self_status_'.$i, 'status', 'enrol_self'); $mform->setDefault('enrol_self_status_'.$i, $this->get_config('status')); $mform->setAdvanced('enrol_self_status_'.$i, $this->get_config('status_adv')); if (!$config) { @@ -173,6 +174,7 @@ public function course_edit_form($instance, MoodleQuickForm $mform, $data, $cont $mform->addElement('passwordunmask', 'enrol_self_password_'.$i, get_string('password', 'enrol_self')); + $mform->addHelpButton('enrol_self_password_'.$i, 'password', 'enrol_self'); if (!$config) { $mform->hardFreeze('enrol_self_password_'.$i); } else { @@ -183,6 +185,7 @@ public function course_edit_form($instance, MoodleQuickForm $mform, $data, $cont $options = array(1 => get_string('yes'), 0 => get_string('no')); $mform->addElement('select', 'enrol_self_customint1_'.$i, get_string('groupkey', 'enrol_self'), $options); + $mform->addHelpButton('enrol_self_customint1_'.$i, 'groupkey', 'enrol_self'); $mform->setDefault('enrol_self_customint1_'.$i, $this->get_config('groupkey')); $mform->setAdvanced('enrol_self_customint1_'.$i, $this->get_config('groupkey_adv')); if (!$config) { diff --git a/group/group_form.php b/group/group_form.php index a030d64657725..65de0c84fa2b8 100644 --- a/group/group_form.php +++ b/group/group_form.php @@ -32,7 +32,7 @@ function definition () { $mform->setType('description_editor', PARAM_RAW); $mform->addElement('passwordunmask', 'enrolmentkey', get_string('enrolmentkey', 'group'), 'maxlength="254" size="24"', get_string('enrolmentkey', 'group')); - $mform->setHelpButton('enrolmentkey', array('groupenrolmentkey', get_string('enrolmentkey', 'group')), true); + $mform->addHelpButton('enrolmentkey', 'enrolmentkey', 'group'); $mform->setType('enrolmentkey', PARAM_RAW); if (!empty($CFG->gdversion)) { diff --git a/lang/en/help/assignroles.html b/lang/en/help/assignroles.html deleted file mode 100644 index d9847e37a849e..0000000000000 --- a/lang/en/help/assignroles.html +++ /dev/null @@ -1,36 +0,0 @@ -

Assigning Roles

- -

-By assigning a role to a user in a context, you -are granting them the permissions contained -in that role, for the current context and all -"lower" contexts. -

- -

-Contexts: -

-
    -
  1. System (the entire installation)
    2. -
  2. Front page (the "site course")
    3. -
  3. Course Categories
    4. -
  4. Course Sub-categories
    5. -
  5. Courses
    6. -
  6. Blocks and Activities
    7. -
- -

-So for example, if you grant a Student role to a -user in a Course, they will have that role for -the course, but also all Blocks and Activities inside -that course. Their actual permissions may depend on -other roles and overrides that have been defined. -

- -

-See also -Roles, -Contexts, -Permissions and -Overrides. -

diff --git a/lang/en/help/enrolmentkey.html b/lang/en/help/enrolmentkey.html deleted file mode 100644 index 589dc93844839..0000000000000 --- a/lang/en/help/enrolmentkey.html +++ /dev/null @@ -1,23 +0,0 @@ -

Course Enrolment Key

- -

A course enrolment key is what keeps unwanted people - out of your course.

- -

If you leave this blank, then anyone who has created - a Moodle username on this site will be able to enrol - in your course simply by going in to it.

- -

If you put something here, then students who are trying - to get in for the FIRST TIME ONLY will be asked to supply - this word or phrase.

- -

The idea is that you will supply the key to authorised - people using another means like private email, snail mail, - on the phone or even verbally in a face to face class.

- -

If this password "gets out" and you have unwanted people - enrolling, you can unenrol them (see their user profile page) - and change this key. Any legitimate students who have already - enrolled will not be affected, but the unwanted people won't be - able to get back in.

- diff --git a/lang/en/help/enrolperiod.html b/lang/en/help/enrolperiod.html deleted file mode 100644 index d7e46be61b367..0000000000000 --- a/lang/en/help/enrolperiod.html +++ /dev/null @@ -1,15 +0,0 @@ -

Enrolment period

- -

This setting specifies the number of days a student can be - enrolled in this course (starting from the moment they enroll).

- -

If this is set, then students are automatically unenrolled - after the specified time has elapsed. This is most useful - for rolling courses without a specific start or end time.

- -

If you don't set this then the student will remain - in this course until they are manually unenrolled or the - clean-up function to remove defunct students takes effect.

- -

If you have selected to manage this course as a meta course, - your enrolment period will not be used.

\ No newline at end of file diff --git a/lang/en/help/extendenrol.html b/lang/en/help/extendenrol.html deleted file mode 100755 index 03ce3612a5bfb..0000000000000 --- a/lang/en/help/extendenrol.html +++ /dev/null @@ -1,14 +0,0 @@ -

Extend enrolment

-

This page allows you to extend or restrict the enrolment period for selected course participants. The new enrolment period is calculated based on a starting reference date and the extended period selected.

-

Possible starting reference dates are:

- - - -

If the extended period is set to 'No change' or 'Unlimited', then the starting reference date is ignored.

\ No newline at end of file diff --git a/lang/en/help/groupenrolmentkey.html b/lang/en/help/groupenrolmentkey.html deleted file mode 100644 index 3a4b6371a9a85..0000000000000 --- a/lang/en/help/groupenrolmentkey.html +++ /dev/null @@ -1,4 +0,0 @@ -

Group Enrolment Key

- -

Enrolment keys allow users to enrol themselves into a course, usually there is one key for the whole course defined in the course settings. However, if you define a *group* enrolment key then not only will entering that key let the user into the course, but it will also automatically make them a member of this group.

- diff --git a/lang/en/help/groupextendenrol.html b/lang/en/help/groupextendenrol.html deleted file mode 100755 index d23d7cb035df6..0000000000000 --- a/lang/en/help/groupextendenrol.html +++ /dev/null @@ -1,14 +0,0 @@ -

Extend enrolment for all

-

This page allows you to extend or restrict the enrolment period by the same amount for all selected course participants. The new enrolment period is calculated based on a starting reference date and the extended period selected.

-

Possible starting reference dates are:

- - - -

If the extended period is set to 'Unlimited', then the starting reference date is ignored.

\ No newline at end of file diff --git a/lang/en/help/guestaccess.html b/lang/en/help/guestaccess.html deleted file mode 100644 index 2f9d8c5a03432..0000000000000 --- a/lang/en/help/guestaccess.html +++ /dev/null @@ -1,42 +0,0 @@ -

Guest Access

- - - -

You have the choice of allowing "guests" into your course.

- - - -

People can log in as guests using the "Login as a guest" button - - on the login screen.

- - - -

Guests ALWAYS have "read-only" access - meaning they can't leave - - any posts or otherwise mess up the course for real students.

- - - -

This can be handy when you want to let a colleague in to - - look around at your work, or to let students see a course before - - they have decided to enrol.

- - - -

Note that you have a choice between two types of guest access: - - with the enrolment key or without. If you choose to allow - - guests who have the key, then the guest will need to provide - - the current enrolment key EVERY TIME they log in (unlike - - students who only need to do it once). This lets you restrict - - your guests. If you choose to allow guests without a key, then - - anyone can get straight into your course.

-