mirror of
https://github.com/moodle/moodle.git
synced 2025-02-13 12:34:28 +01:00
Merge branch 'MDL-26252-import-groups-help' of git://github.com/mudrd8mz/moodle
This commit is contained in:
commit
82bbf32d3c
@ -39,15 +39,13 @@ $context = get_context_instance(CONTEXT_COURSE, $id);
|
||||
|
||||
require_capability('moodle/course:managegroups', $context);
|
||||
|
||||
$strimportgroups = get_string("importgroups");
|
||||
$strimportgroups = get_string('importgroups', 'core_group');
|
||||
|
||||
/// Print the header
|
||||
$PAGE->navbar->add($course->shortname, new moodle_url('/course/view.php', array('id'=>$course->id)));
|
||||
$PAGE->navbar->add(get_string('import'), new moodle_url('/course/import.php', array('id'=>$course->id)));
|
||||
$PAGE->navbar->add($strimportgroups);
|
||||
|
||||
navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
|
||||
$PAGE->set_title("$course->shortname: $strimportgroups");
|
||||
$PAGE->set_heading($course->fullname);
|
||||
$PAGE->set_pagelayout('standard');
|
||||
|
||||
$returnurl = new moodle_url('/group/index.php', array('id'=>$id));
|
||||
|
||||
@ -188,6 +186,6 @@ if ($mform_post->is_cancelled()) {
|
||||
|
||||
/// Print the form
|
||||
echo $OUTPUT->header();
|
||||
echo $OUTPUT->heading($strimportgroups);
|
||||
echo $OUTPUT->heading_with_help($strimportgroups, 'importgroups', 'core_group');
|
||||
$mform_post ->display();
|
||||
echo $OUTPUT->footer();
|
||||
|
@ -23,7 +23,7 @@ class groups_import_form extends moodleform {
|
||||
|
||||
$mform->addElement('hidden', 'id');
|
||||
|
||||
$this->add_action_buttons(true, get_string('importgroups'));
|
||||
$this->add_action_buttons(true, get_string('importgroups', 'core_group'));
|
||||
|
||||
$this->set_data($data);
|
||||
}
|
||||
|
@ -215,7 +215,7 @@ echo '<p><input type="submit" name="act_showautocreategroupsform" id="showautocr
|
||||
. get_string('autocreategroups', 'group') . '" /></p>'."\n";
|
||||
|
||||
echo '<p><input type="submit" name="act_showimportgroups" id="showimportgroups" value="'
|
||||
. get_string('importgroups') . '" /></p>'."\n";
|
||||
. get_string('importgroups', 'core_group') . '" /></p>'."\n";
|
||||
|
||||
echo '</td>'."\n";
|
||||
echo '<td>'."\n";
|
||||
|
@ -114,6 +114,15 @@ $string['groupsseparate'] = 'Separate groups';
|
||||
$string['groupsvisible'] = 'Visible groups';
|
||||
$string['grouptemplate'] = 'Group @';
|
||||
$string['hidepicture'] = 'Hide picture';
|
||||
$string['importgroups'] = 'Import groups';
|
||||
$string['importgroups_help'] = 'Groups may be imported via text file. The format of the file should be as follows:
|
||||
|
||||
* Each line of the file contains one record
|
||||
* Each record is a series of data separated by commas
|
||||
* The first record contains a list of fieldnames defining the format of the rest of the file
|
||||
* Required fieldname is groupname
|
||||
* Optional fieldnames are description, enrolmentkey, picture, hidepicture';
|
||||
$string['importgroups_link'] = 'group/import';
|
||||
$string['javascriptrequired'] = 'This page requires JavaScript to be enabled.';
|
||||
$string['members'] = 'Members per group';
|
||||
$string['membersofselectedgroup'] = 'Members of:';
|
||||
|
@ -859,7 +859,6 @@ $string['importdata'] = 'Import course data';
|
||||
$string['importdataexported'] = 'Exported data from \'from\' course successfully.<br /> Continue to import into your \'to\' course.';
|
||||
$string['importdatafinished'] = 'Import complete! Continue to your course';
|
||||
$string['importdatafrom'] = 'Find a course to import data from:';
|
||||
$string['importgroups'] = 'Import groups';
|
||||
$string['inactive'] = 'Inactive';
|
||||
$string['include'] = 'Include';
|
||||
$string['includeallusers'] = 'Include all users';
|
||||
|
Loading…
x
Reference in New Issue
Block a user