mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-51354_master' of https://github.com/cdsmith-umn/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-04-20 10:33:23 +01:00
commit ab64fe91fc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/en/moodle.php
View File

@ -558,7 +558,10 @@ $string['edituser'] = 'Edit user accounts';
$string['edulevelother'] = 'Other'; $string['edulevelother'] = 'Other';
$string['edulevelteacher'] = 'Teaching'; $string['edulevelteacher'] = 'Teaching';
$string['edulevelparticipating'] = 'Participating'; $string['edulevelparticipating'] = 'Participating';
$string['edulevel'] = 'Educational level'; $string['edulevel'] = 'All events';
$string['edulevel_help'] = '* Teaching - actions performed by a teacher, e.g. updating a resource
* Participating - actions performed by a student, e.g. posting in a forum
* Other - actions performed by a user with a role other than teacher or student';
$string['email'] = 'Email address'; $string['email'] = 'Email address';
$string['emailalreadysent'] = 'A password reset email has already been sent. Please check your email.'; $string['emailalreadysent'] = 'A password reset email has already been sent. Please check your email.';
$string['emailactive'] = 'Email activated'; $string['emailactive'] = 'Email activated';

2
report/log/classes/renderer.php
View File

@ -167,7 +167,7 @@ class report_log_renderer extends plugin_renderer_base {
// Add edulevel. // Add edulevel.
$edulevel = $reportlog->get_edulevel_options(); $edulevel = $reportlog->get_edulevel_options();
echo html_writer::label(get_string('edulevel'), 'menuedulevel', false, array('class' => 'accesshide')); echo html_writer::label(get_string('edulevel'), 'menuedulevel', false, array('class' => 'accesshide'));
echo html_writer::select($edulevel, 'edulevel', $reportlog->edulevel, false); echo html_writer::select($edulevel, 'edulevel', $reportlog->edulevel, false).$this->help_icon('edulevel');
// Add reader option. // Add reader option.
// If there is some reader available then only show submit button. // If there is some reader available then only show submit button.