diff --git a/report/courseoverview/index.php b/report/courseoverview/index.php index 9fe5c13d40c..637f80a9cad 100644 --- a/report/courseoverview/index.php +++ b/report/courseoverview/index.php @@ -75,12 +75,15 @@ $table = new html_table(); $table->width = '*'; $table->align = array('left','left','left','left','left','left'); -$reporttypemenu = html_writer::select($reportoptions,'report',$report, false); -$timeoptionsmenu = html_writer::select($timeoptions,'time',$time, false); +$reporttypemenu = html_writer::label(get_string('statsreporttype'), 'menureport', false, array('class' => 'accesshide')); +$reporttypemenu .= html_writer::select($reportoptions,'report',$report, false); +$timeoptionsmenu = html_writer::label(get_string('time'), 'menutime', false, array('class' => 'accesshide')); +$timeoptionsmenu .= html_writer::select($timeoptions,'time',$time, false); $table->data[] = array(get_string('statsreporttype'),$reporttypemenu, get_string('statstimeperiod'),$timeoptionsmenu, - '', + '' . + '', '') ; echo html_writer::table($table); diff --git a/report/log/lang/en/report_log.php b/report/log/lang/en/report_log.php index 677fab5a046..e62ad6ad4f4 100644 --- a/report/log/lang/en/report_log.php +++ b/report/log/lang/en/report_log.php @@ -26,6 +26,7 @@ $string['log:view'] = 'View course logs'; $string['log:viewtoday'] = 'View today\'s logs'; +$string['logsformat'] = 'Logs format'; $string['page-report-log-x'] = 'Any log report'; $string['page-report-log-index'] = 'Course log report'; $string['page-report-log-user'] = 'User course log report'; diff --git a/report/log/locallib.php b/report/log/locallib.php index dd543b099f7..9544e910009 100644 --- a/report/log/locallib.php +++ b/report/log/locallib.php @@ -306,10 +306,12 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, echo "\n"; if (has_capability('report/log:view', $sitecontext) && $showcourses) { $cid = empty($course->id)? '1' : $course->id; + echo html_writer::label(get_string('selectacoursesite'), 'menuhost_course', false, array('class' => 'accesshide')); echo html_writer::select($dropdown, "host_course", $hostid.'/'.$cid); } else { $courses = array(); $courses[$course->id] = $course->fullname . ((empty($course->category)) ? ' ('.get_string('site').') ' : ''); + echo html_writer::label(get_string('selectacourse'), 'menuid', false, array('class' => 'accesshide')); echo html_writer::select($courses,"id",$course->id, false); if (has_capability('report/log:view', $sitecontext)) { $a = new stdClass(); @@ -328,10 +330,12 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, else { $groups = array(); } + echo html_writer::label(get_string('selectagroup'), 'menugroup', false, array('class' => 'accesshide')); echo html_writer::select($groups, "group", $selectedgroup, get_string("allgroups")); } if ($showusers) { + echo html_writer::label(get_string('participantslist'), 'menuuser', false, array('class' => 'accesshide')); echo html_writer::select($users, "user", $selecteduser, get_string("allparticipants")); } else { @@ -343,20 +347,25 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, else { $users[0] = get_string('allparticipants'); } + echo html_writer::label(get_string('participantslist'), 'menuuser', false, array('class' => 'accesshide')); echo html_writer::select($users, "user", $selecteduser, false); $a->url = "$CFG->wwwroot/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser" ."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses"; print_string('logtoomanyusers','moodle',$a); } + echo html_writer::label(get_string('date'), 'menudate', false, array('class' => 'accesshide')); echo html_writer::select($dates, "date", $selecteddate, get_string("alldays")); + echo html_writer::label(get_string('showreports'), 'menumodid', false, array('class' => 'accesshide')); echo html_writer::select($activities, "modid", $selectedactivity, get_string("allactivities")); + echo html_writer::label(get_string('actions'), 'menumodaction', false, array('class' => 'accesshide')); echo html_writer::select($actions, 'modaction', $modaction, get_string("allactions")); $logformats = array('showashtml' => get_string('displayonpage'), 'downloadascsv' => get_string('downloadtext'), 'downloadasods' => get_string('downloadods'), 'downloadasexcel' => get_string('downloadexcel')); + echo html_writer::label(get_string('logsformat', 'report_log'), 'menulogformat', false, array('class' => 'accesshide')); echo html_writer::select($logformats, 'logformat', $logformat, false); echo ''; echo ''; @@ -546,11 +555,13 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate= echo "\n"; echo "\n"; if (has_capability('report/log:view', $sitecontext) && $showcourses) { + echo html_writer::label(get_string('selectacourse'), 'menuid', false, array('class' => 'accesshide')); echo html_writer::select($courses, "id", $course->id, false); } else { // echo ''; $courses = array(); $courses[$course->id] = $course->fullname . (($course->id == SITEID) ? ' ('.get_string('site').') ' : ''); + echo html_writer::label(get_string('selectacourse'), 'menuid', false, array('class' => 'accesshide')); echo html_writer::select($courses,"id",$course->id, false); if (has_capability('report/log:view', $sitecontext)) { $a = new stdClass(); @@ -569,10 +580,12 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate= else { $groups = array(); } + echo html_writer::label(get_string('selectagroup'), 'menugroup', false, array('class' => 'accesshide')); echo html_writer::select($groups, "group", $selectedgroup, get_string("allgroups")); } if ($showusers) { + echo html_writer::label(get_string('selctauser'), 'menuuser', false, array('class' => 'accesshide')); echo html_writer::select($users, "user", $selecteduser, get_string("allparticipants")); } else { @@ -584,15 +597,19 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate= else { $users[0] = get_string('allparticipants'); } + echo html_writer::label(get_string('selctauser'), 'menuuser', false, array('class' => 'accesshide')); echo html_writer::select($users, "user", $selecteduser, false); $a = new stdClass(); $a->url = "$CFG->wwwroot/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser" ."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses"; print_string('logtoomanyusers','moodle',$a); } + echo html_writer::label(get_string('date'), 'menudate', false, array('class' => 'accesshide')); echo html_writer::select($dates, "date", $selecteddate, get_string("alldays")); + echo html_writer::label(get_string('activities'), 'menumodid', false, array('class' => 'accesshide')); echo html_writer::select($activities, "modid", $selectedactivity, get_string("allactivities")); + echo html_writer::label(get_string('actions'), 'menumodaction', false, array('class' => 'accesshide')); echo html_writer::select($actions, 'modaction', $modaction, get_string("allactions")); $logformats = array('showashtml' => get_string('displayonpage'), @@ -600,6 +617,7 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate= 'downloadasods' => get_string('downloadods'), 'downloadasexcel' => get_string('downloadexcel')); + echo html_writer::label(get_string('logsformat', 'report_log'), 'menulogformat', false, array('class' => 'accesshide')); echo html_writer::select($logformats, 'logformat', $logformat, false); echo ''; echo ''; diff --git a/report/participation/index.php b/report/participation/index.php index 50c5b6e6c1c..6fad8e44fd5 100644 --- a/report/participation/index.php +++ b/report/participation/index.php @@ -311,7 +311,7 @@ if (!empty($instanceid) && !empty($roleid)) { } echo ''; echo '