From 40094ddbe02400c05c7b66506bf57fff9c0a48a2 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Mon, 22 Jul 2024 14:17:47 +0800
Subject: [PATCH 1/2] MDL-82551 core: Set welcome message heading to level 1

---
 lib/templates/welcome.mustache |  4 ++--
 my/tests/behat/welcome.feature | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/templates/welcome.mustache b/lib/templates/welcome.mustache
index 60b02db4786..7f9bfa8553d 100644
--- a/lib/templates/welcome.mustache
+++ b/lib/templates/welcome.mustache
@@ -25,7 +25,7 @@
     }
 }}
 {{#welcomemessage}}
-<h2 class="mb-3 mt-3">
+<h1 class="h2 mb-3 mt-3">
     {{.}}
-</h2>
+</h1>
 {{/welcomemessage}}
diff --git a/my/tests/behat/welcome.feature b/my/tests/behat/welcome.feature
index 2c4a1bf8dd6..7fead25598d 100644
--- a/my/tests/behat/welcome.feature
+++ b/my/tests/behat/welcome.feature
@@ -30,3 +30,20 @@ Feature: Welcome message
     And I should see "You are not logged in" in the "page-footer" "region"
     And I log in as "admin"
     Then I should see "Hi, Admin!" in the "page-header" "region"
+
+  @accessibility @javascript
+  Scenario Outline: The start page must meet accessibility standards when the welcome message is displayed
+    Given the following config values are set as admin:
+      | defaulthomepage | <defaulthomepage> |
+    When I log in as "admin"
+    Then I should see "Welcome, Admin!" in the "page-header" "region"
+    And the page should meet accessibility standards
+
+    Examples:
+      | defaulthomepage |
+      # Home.
+      | 0               |
+      # Dashboard.
+      | 1               |
+      # My courses.
+      | 2               |

From 4f3c3432cdcd4d37042ed99370a5df0d8d8cee03 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Wed, 24 Jul 2024 12:04:25 +0800
Subject: [PATCH 2/2] MDL-82551 block_recentlyaccesseditems: Mark up decorative
 image properly

This change applies the same change in MDL-70829 to make the
accessibility Behat test for the welcome message to pass.
---
 blocks/recentlyaccesseditems/templates/no-items.mustache | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/blocks/recentlyaccesseditems/templates/no-items.mustache b/blocks/recentlyaccesseditems/templates/no-items.mustache
index 83ef42afd38..a104252de80 100644
--- a/blocks/recentlyaccesseditems/templates/no-items.mustache
+++ b/blocks/recentlyaccesseditems/templates/no-items.mustache
@@ -27,9 +27,8 @@
 <div class="text-xs-center text-center mt-4" data-region="empty-message">
     <img
         src="{{noitemsimgurl}}"
-        alt="{{#str}} noitems, block_recentlyaccesseditems {{/str}}"
-        role="presentation"
+        alt=""
         style="height: 70px; width: 70px;"
     >
     <p class="text-muted mt-3 mb-0">{{#str}} noitems, block_recentlyaccesseditems {{/str}}</p>
-</div>
\ No newline at end of file
+</div>