Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-34561_accessibility_m22' of git://github.com/rwijay…

…a/moodle into MOODLE_22_STABLE
  • Loading branch information...
commit c834462e08c20da85cae5d4d76f3e9fb67cfbddc 2 parents a0e776e + 7fc8b19
@danpoltawski danpoltawski authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 mod/assignment/lib.php
View
11 mod/assignment/lib.php
@@ -1468,7 +1468,8 @@ function display_submissions($message='') {
} else if ($quickgrade) {
$attributes = array();
$attributes['tabindex'] = $tabindex++;
- $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
+ $menu = html_writer::label(get_string('assignment:grade', 'assignment'), 'menumenu'. $auser->id, false, array('class' => ''));
+ $menu .= html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
$grade = '<div id="g'.$auser->id.'">'. $menu .'</div>';
} else {
$grade = '<div id="g'.$auser->id.'">'.$this->display_grade($auser->grade).'</div>';
@@ -1481,7 +1482,8 @@ function display_submissions($message='') {
} else if ($quickgrade) {
$attributes = array();
$attributes['tabindex'] = $tabindex++;
- $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
+ $menu = html_writer::label(get_string('assignment:grade', 'assignment'), 'menumenu'. $auser->id, false, array('class' => 'accesshide'));
+ $menu .= html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
$grade = '<div id="g'.$auser->id.'">'.$menu.'</div>';
} else {
$grade = '<div id="g'.$auser->id.'">'.$this->display_grade($auser->grade).'</div>';
@@ -1509,7 +1511,8 @@ function display_submissions($message='') {
} else if ($quickgrade) { // allow editing
$attributes = array();
$attributes['tabindex'] = $tabindex++;
- $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
+ $menu = html_writer::label(get_string('assignment:grade', 'assignment'), 'menumenu'. $auser->id, false, array('class' => 'accesshide'));
+ $menu .= html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
$grade = '<div id="g'.$auser->id.'">'.$menu.'</div>';
$hassubmission = true;
} else {
@@ -1553,7 +1556,7 @@ function display_submissions($message='') {
if ($uses_outcomes) {
foreach($grading_info->outcomes as $n=>$outcome) {
- $outcomes .= '<div class="outcome"><label>'.$outcome->name.'</label>';
+ $outcomes .= '<div class="outcome"><label for="'. 'outcome_'.$n.'_'.$auser->id .'">'.$outcome->name.'</label>';
$options = make_grades_menu(-$outcome->scaleid);
if ($outcome->grades[$auser->id]->locked or !$quickgrade) {
Please sign in to comment.
Something went wrong with that request. Please try again.