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

Merge branch 'MDL-68343-master' of git://github.com/rezaies/moodle

Browse Source
This commit is contained in:
Sara Arjona 2020-05-27 15:09:39 +02:00
commit 8e1b43f0d5
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grade/lib.php
View File

@ -1791,8 +1791,9 @@ class grade_structure {
return '';
}
return $OUTPUT->action_icon($url, new pix_icon('t/preview',
get_string('gradeanalysis', 'core_grades')));
$title = get_string('gradeanalysis', 'core_grades');
return $OUTPUT->action_icon($url, new pix_icon('t/preview', ''), null,
['title' => $title, 'aria-label' => $title]);
}
/**

7
grade/report/singleview/classes/local/screen/grade.php
View File

@ -208,11 +208,12 @@ class grade extends tablelike implements selectable_items, filterable_items {
$url = new moodle_url("/user/view.php", array('id' => $item->id, 'course' => $this->courseid));
$iconstring = get_string('filtergrades', 'gradereport_singleview', $fullname);
$grade->label = $fullname;
$userpic = $OUTPUT->user_picture($item, ['link' => false, 'visibletoscreenreaders' => false]);
$line = array(
$OUTPUT->action_icon($this->format_link('user', $item->id), new pix_icon('t/editstring', $iconstring)),
$OUTPUT->user_picture($item, array('visibletoscreenreaders' => false)) .
html_writer::link($url, $fullname),
$OUTPUT->action_icon($this->format_link('user', $item->id), new pix_icon('t/editstring', ''), null,
['title' => $iconstring, 'aria-label' => $iconstring]),
html_writer::link($url, $userpic . $fullname),
$this->item_range()
);
$lineclasses = array(

3
grade/report/singleview/classes/local/screen/tablelike.php
View File

@ -172,7 +172,8 @@ abstract class tablelike extends screen {
$summary = $this->summary();
if (!empty($summary)) {
$table->summary = $summary;
$table->caption = $summary;
$table->captionhide = true;
}
// To be used for extra formatting.

3
grade/report/singleview/classes/local/screen/user.php
View File

@ -190,7 +190,8 @@ class user extends tablelike implements selectable_items {
$grade->label = $item->get_name();
$line = array(
$OUTPUT->action_icon($this->format_link('grade', $item->id), new pix_icon('t/editstring', $iconstring)),
$OUTPUT->action_icon($this->format_link('grade', $item->id), new pix_icon('t/editstring', ''), null,
['title' => $iconstring, 'aria-label' => $iconstring]),
$this->format_icon($item) . $lockicon . $itemlabel,
$this->category($item),
new range($item)

2
grade/report/singleview/templates/text_attribute.mustache
View File

@ -28,6 +28,6 @@
"disabled": "true"
}
}}
<label for="{{name}}" class="accesshide">{{label}}</label>
{{#label}}<label for="{{name}}" class="accesshide">{{label}}</label>{{/label}}
<input id="{{name}}" name="{{name}}" type="text" value="{{value}}" class="form-control" {{#tabindex}}tabindex="{{.}}"{{/tabindex}} {{#disabled}}disabled{{/disabled}}>
<input type="hidden" name="old{{name}}" value="{{value}}">

20
lib/outputcomponents.php
View File

@ -2207,8 +2207,9 @@ class html_writer {
$heading->header = true;
}
if ($heading->header && empty($heading->scope)) {
$heading->scope = 'col';
$tagtype = 'td';
if ($heading->header && (string)$heading->text != '') {
$tagtype = 'th';
}
$heading->attributes['class'] .= ' header c' . $key;
@ -2224,16 +2225,15 @@ class html_writer {
$heading->attributes['class'] .= ' ' . $table->colclasses[$key];
}
$heading->attributes['class'] = trim($heading->attributes['class']);
$attributes = array_merge($heading->attributes, array(
'style' => $table->align[$key] . $table->size[$key] . $heading->style,
'scope' => $heading->scope,
'colspan' => $heading->colspan,
));
$attributes = array_merge($heading->attributes, [
'style' => $table->align[$key] . $table->size[$key] . $heading->style,
'colspan' => $heading->colspan,
]);
$tagtype = 'td';
if ($heading->header === true) {
$tagtype = 'th';
if ($tagtype == 'th') {
$attributes['scope'] = !empty($heading->scope) ? $heading->scope : 'col';
}
$output .= html_writer::tag($tagtype, $heading->text, $attributes) . "\n";
}
$output .= html_writer::end_tag('tr') . "\n";