Merge branch 'MDL-47610-master' of git://github.com/zbdd/moodle

This commit is contained in:
Dan Poltawski 2014-12-16 12:59:45 +00:00
commit c236f820e1

View File

@ -427,11 +427,6 @@ class grade_edit_tree {
);
$str .= $checkboxlbl . $checkbox . $hiddenlabel . $input;
if ($item->aggregationcoef > 0) {
$str .= ' ' . html_writer::tag('abbr', get_string('aggregationcoefextrasumabbr', 'grades'),
array('title' => get_string('aggregationcoefextrasum', 'grades')));
}
}
return $str;
@ -771,6 +766,11 @@ class grade_edit_tree_column_range extends grade_edit_tree_column {
$grademax = format_float($item->grademax, $item->get_decimals());
}
if ($item->aggregationcoef > 0 && $parent_cat->is_extracredit_used()) {
$grademax .= ' ' . html_writer::tag('abbr', get_string('aggregationcoefextrasumabbr', 'grades'),
array('title' => get_string('aggregationcoefextrasum', 'grades')));
}
$itemcell = parent::get_item_cell($item, $params);
$itemcell->text = $grademax;
return $itemcell;