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-78550-401' of https://github.com/junpataleta/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Ilya Tregubov 2023-08-07 11:34:49 +08:00
commit 52b234d69a
No known key found for this signature in database
GPG Key ID: 0F58186F748E55C1
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
grade/edit/tree/lib.php
View File

@ -312,8 +312,8 @@ class grade_edit_tree {
$headercell = new html_table_cell(); $headercell = new html_table_cell();
$headercell->header = true; $headercell->header = true;
$headercell->scope = 'row'; $headercell->scope = 'row';
$headercell->attributes['title'] = $object->stripped_name;
$headercell->attributes['class'] = 'cell column-rowspan rowspan ' . $levelclass; $headercell->attributes['class'] = 'cell column-rowspan rowspan ' . $levelclass;
$headercell->attributes['aria-hidden'] = 'true';
$headercell->rowspan = $row_count + 1; $headercell->rowspan = $row_count + 1;
$row->cells[] = $headercell; $row->cells[] = $headercell;
@ -338,6 +338,7 @@ class grade_edit_tree {
$endcell = new html_table_cell(); $endcell = new html_table_cell();
$endcell->colspan = (19 - $level); $endcell->colspan = (19 - $level);
$endcell->attributes['class'] = 'emptyrow colspan ' . $levelclass; $endcell->attributes['class'] = 'emptyrow colspan ' . $levelclass;
$endcell->attributes['aria-hidden'] = 'true';
$returnrows[] = new html_table_row(array($endcell)); $returnrows[] = new html_table_row(array($endcell));
@ -749,13 +750,11 @@ abstract class grade_edit_tree_column {
public function get_category_cell($category, $levelclass, $params) { public function get_category_cell($category, $levelclass, $params) {
$cell = clone($this->categorycell); $cell = clone($this->categorycell);
$cell->attributes['class'] .= ' ' . $levelclass; $cell->attributes['class'] .= ' ' . $levelclass;
$cell->attributes['text'] = '';
return $cell; return $cell;
} }
public function get_item_cell($item, $params) { public function get_item_cell($item, $params) {
$cell = clone($this->itemcell); $cell = clone($this->itemcell);
$cell->attributes['text'] = '';
if (isset($params['level'])) { if (isset($params['level'])) {
$level = $params['level'] + (($item->itemtype == 'category' || $item->itemtype == 'course') ? 0 : 1); $level = $params['level'] + (($item->itemtype == 'category' || $item->itemtype == 'course') ? 0 : 1);
$cell->attributes['class'] .= ' level' . $level; $cell->attributes['class'] .= ' level' . $level;
@ -1029,7 +1028,7 @@ class grade_edit_tree_column_select extends grade_edit_tree_column {
} }
// Build the master checkbox. // Build the master checkbox.
$mastercheckbox = new \core\output\checkbox_toggleall($togglegroup, true, [ $mastercheckbox = new \core\output\checkbox_toggleall($togglegroup, true, [
'id' => $togglegroup, 'id' => 'select_category_' . $category->id,
'name' => $togglegroup, 'name' => $togglegroup,
'value' => 1, 'value' => 1,
'classes' => 'itemselect ignoredirty', 'classes' => 'itemselect ignoredirty',

14
grade/lib.php
View File

@ -970,15 +970,13 @@ function print_grade_page_head(int $courseid, string $active_type, ?string $acti
$output = ''; $output = '';
// Add a help dialogue box if provided. // Add a help dialogue box if provided.
if (isset($headerhelpidentifier)) { if (isset($headerhelpidentifier) && !empty($heading)) {
$output = $OUTPUT->heading_with_help($heading, $headerhelpidentifier, $headerhelpcomponent); $output = $OUTPUT->heading_with_help($heading, $headerhelpidentifier, $headerhelpcomponent);
} else { } else if (isset($user)) {
if (isset($user)) { $renderer = $PAGE->get_renderer('core_grades');
$renderer = $PAGE->get_renderer('core_grades'); $output = $OUTPUT->heading($renderer->user_heading($user, $courseid));
$output = $OUTPUT->heading($renderer->user_heading($user, $courseid)); } else if (!empty($heading)) {
} else { $output = $OUTPUT->heading($heading);
$output = $OUTPUT->heading($heading);
}
} }
if ($return) { if ($return) {

4
lib/templates/moremenu_children.mustache
View File

@ -43,7 +43,7 @@
{{#children}} {{#children}}
{{^divider}} {{^divider}}
{{#is_action_link}} {{#is_action_link}}
<a class="dropdown-item" role="menuitem" {{#actionattributes}}{{name}}="{{value}}"{{/actionattributes}} href="{{{url}}}{{{action}}}" <a class="dropdown-item" role="menuitem" {{#actionattributes}}{{name}}="{{value}}" {{/actionattributes}} href="{{{url}}}{{{action}}}"
data-disableactive="true" tabindex="-1" data-disableactive="true" tabindex="-1"
> >
{{{text}}} {{{text}}}
@ -86,7 +86,7 @@
{{/istablist}} {{/istablist}}
{{^istablist}} {{^istablist}}
{{#is_action_link}} {{#is_action_link}}
<a role="menuitem" class="nav-link {{#classes}}{{.}} {{/classes}}" {{#actionattributes}}{{name}}="{{value}}"{{/actionattributes}} href="{{{url}}}{{{action}}}" data-disableactive="true" tabindex="-1"> <a role="menuitem" class="nav-link {{#classes}}{{.}} {{/classes}}" {{#actionattributes}}{{name}}="{{value}}" {{/actionattributes}} href="{{{url}}}{{{action}}}" data-disableactive="true" tabindex="-1">
{{{text}}} {{{text}}}
</a> </a>
{{#action_link_actions}} {{#action_link_actions}}