Merge branch 'MDL-86489-405' of https://github.com/junpataleta/moodle into MOODLE_405_STABLE

mod/feedback/classes/complete_form.php

@@ -348,7 +348,13 @@ class mod_feedback_complete_form extends moodleform {
 
         // Add red asterisks on required fields.
         if ($item->required) {
-            $required = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form'), 'moodle', ['class' => 'ms-2']);
+            $requiredlabel = get_string('requiredelement', 'form');
+            $pixparams = [
+                'class' => 'ms-2',
+                'title' => $requiredlabel,
+            ];
+            $required = $OUTPUT->pix_icon('req', '', 'moodle', $pixparams)
+                . \core\output\html_writer::span("($requiredlabel)", 'sr-only');
             $element->setLabel($element->getLabel() . $required);
             $this->hasrequired = true;
         }

mod/feedback/edit.php

@@ -96,7 +96,7 @@ $PAGE->add_body_class('limitedwidth');
 $PAGE->requires->js_call_amd('mod_feedback/edit', 'init', [$cm->id]);
 
 echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('edit_items', 'mod_feedback'), 3);
+echo $OUTPUT->heading(get_string('edit_items', 'mod_feedback'), $PAGE->activityheader->get_heading_level());
 echo $renderer->main_action_bar($actionbar);
 $form = new mod_feedback_complete_form(mod_feedback_complete_form::MODE_EDIT,
         $feedbackstructure, 'feedback_edit_form');

mod/feedback/tests/behat/templates.feature

@@ -157,6 +157,7 @@ Feature: Saving, using and deleting feedback templates
     # Save feedback as both public and course template
     When I am on the "Learning experience course 1" "feedback activity" page logged in as manager
     And I navigate to "Questions" in current page administration
+    And the "region-main" "region" should meet accessibility standards with "best-practice" extra tests
     And I press "Actions"
     And I choose "Save as new template" in the open action menu
     And I set the field "Name" to "My public template"