Merge branch 'MDL-78550-master' of https://github.com/junpataleta/moodle

abgreeve · Aug 7, 2023 · 2e18ba8 · 2e18ba8
2 parents 1474f74 + eaa1ce1
commit 2e18ba8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/grade/classes/output/gradebook_setup_action_bar.php b/grade/classes/output/gradebook_setup_action_bar.php
@@ -63,7 +63,6 @@ public function export_for_template(\renderer_base $output): array {
             'get',
             \single_button::BUTTON_SECONDARY,
             [
-                'class' => 'btn btn-secondary',
                 'data-courseid' => $courseid,
                 'data-itemid' => -1,
                 'data-trigger' => 'add-item-form',
@@ -99,7 +98,6 @@ public function export_for_template(\renderer_base $output): array {
             'get',
             \single_button::BUTTON_SECONDARY,
             [
-                'class' => 'btn btn-secondary',
                 'data-courseid' => $courseid,
                 'data-category' => -1,
                 'data-trigger' => 'add-category-form',

diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
@@ -296,11 +296,13 @@ public function build_html_tree($element, $totals, $parents, $level, &$row_count
             $parentcategories = array_merge($rowclasses, [$eid]);
             $emptyrow->attributes['class'] = 'spacer ' . implode(' ', $parentcategories);
             $emptyrow->attributes['data-hidden'] = 'false';
+            $emptyrow->attributes['aria-hidden'] = 'true';
 
             $headercell = new html_table_cell();
             $headercell->header = true;
             $headercell->scope = 'row';
             $headercell->attributes['class'] = 'cell column-rowspan rowspan';
+            $headercell->attributes['aria-hidden'] = 'true';
             $headercell->rowspan = $row_count;
             $emptyrow->cells[] = $headercell;
 
@@ -310,6 +312,7 @@ public function build_html_tree($element, $totals, $parents, $level, &$row_count
             $endcell = new html_table_cell();
             $endcell->colspan = (19 - $level);
             $endcell->attributes['class'] = 'emptyrow colspan ' . $levelclass;
+            $endcell->attributes['aria-hidden'] = 'true';
 
             $returnrows[] = new html_table_row(array($endcell));
 
@@ -740,13 +743,11 @@ public abstract function get_header_cell();
     public function get_category_cell($category, $levelclass, $params) {
         $cell = clone($this->categorycell);
         $cell->attributes['class'] .= ' ' . $levelclass;
-        $cell->attributes['text'] = '';
         return $cell;
     }
 
     public function get_item_cell($item, $params) {
         $cell = clone($this->itemcell);
-        $cell->attributes['text'] = '';
         if (isset($params['level'])) {
             $level = $params['level'] + (($item->itemtype == 'category' || $item->itemtype == 'course') ? 0 : 1);
             $cell->attributes['class'] .= ' level' . $level;
@@ -827,7 +828,7 @@ public function get_category_cell($category, $levelclass, $params) {
             $masterlabel = $params['level'] === 1 ? get_string('all') : $params['name'];
             // Build the master checkbox.
             $mastercheckbox = new \core\output\checkbox_toggleall($togglegroup, true, [
-                'id' => $togglegroup,
+                'id' => 'select_category_' . $category->id,
                 'name' => $togglegroup,
                 'value' => 1,
                 'classes' => 'itemselect ignoredirty mr-2',
@@ -1203,7 +1204,7 @@ public function get_category_cell($category, $levelclass, $params) {
         }
         // Build the master checkbox.
         $mastercheckbox = new \core\output\checkbox_toggleall($togglegroup, true, [
-            'id' => $togglegroup,
+            'id' => 'select_category_' . $category->id,
             'name' => $togglegroup,
             'value' => 1,
             'classes' => 'itemselect ignoredirty',

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

diff --git a/lib/templates/moremenu_children.mustache b/lib/templates/moremenu_children.mustache
@@ -43,7 +43,7 @@
             {{#children}}
                 {{^divider}}
                     {{#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"
                         >
                             {{{text}}}
@@ -86,7 +86,7 @@
         {{/istablist}}
         {{^istablist}}
             {{#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}}}
                 </a>
                 {{#action_link_actions}}