From 40c9fc79a94287a68e495f7781d3e6be376de4e4 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 19 Oct 2019 21:15:33 +0100
Subject: [PATCH 1/2] [4.0] Default Menu icon

Add aria hidden class to the icon and sr-only text to indicate that it is the default menu

pr for #26656
---
 administrator/modules/mod_menu/tmpl/default_submenu.php | 2 +-
 administrator/modules/mod_submenu/Menu/Menu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php
index f0530bd37987f..401c0b1691f21 100644
--- a/administrator/modules/mod_menu/tmpl/default_submenu.php
+++ b/administrator/modules/mod_menu/tmpl/default_submenu.php
@@ -105,7 +105,7 @@
 {
 	if (substr($iconImage, 0, 6) == 'class:' && substr($iconImage, 6) == 'icon-home')
 	{
-		$iconImage = '<span class="home-image icon-featured"></span>';
+		$iconImage = '<span class="home-image icon-featured" aria-hidden="true"></span><span class="sr-only">' . Text::_('JDEFAULT') . '</span>';
 	}
 	elseif (substr($iconImage, 0, 6) == 'image:')
 	{
diff --git a/administrator/modules/mod_submenu/Menu/Menu.php b/administrator/modules/mod_submenu/Menu/Menu.php
index dbbebfd8009ea..3ff4ec8bd0a8e 100644
--- a/administrator/modules/mod_submenu/Menu/Menu.php
+++ b/administrator/modules/mod_submenu/Menu/Menu.php
@@ -169,7 +169,7 @@ public static function preprocess($parent)
 				{
 					if (substr($iconImage, 0, 6) === 'class:' && substr($iconImage, 6) === 'icon-home')
 					{
-						$iconImage = '<span class="home-image icon-featured"></span>';
+						$iconImage = '<span class="home-image icon-featured" aria-hidden="true"></span><span class="sr-only">' . Text::_('JDEFAULT') . '</span>';
 					}
 					elseif (substr($iconImage, 0, 6) === 'image:')
 					{

From e31c14a3d551cd1034e4f855aa4d07ba6c1108d1 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 19 Oct 2019 22:04:59 +0100
Subject: [PATCH 2/2] make drone happy

---
 administrator/modules/mod_menu/tmpl/default_submenu.php | 3 ++-
 administrator/modules/mod_submenu/Menu/Menu.php         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php
index 401c0b1691f21..978b66fba1091 100644
--- a/administrator/modules/mod_menu/tmpl/default_submenu.php
+++ b/administrator/modules/mod_menu/tmpl/default_submenu.php
@@ -105,7 +105,8 @@
 {
 	if (substr($iconImage, 0, 6) == 'class:' && substr($iconImage, 6) == 'icon-home')
 	{
-		$iconImage = '<span class="home-image icon-featured" aria-hidden="true"></span><span class="sr-only">' . Text::_('JDEFAULT') . '</span>';
+		$iconImage = '<span class="home-image icon-featured" aria-hidden="true"></span>';
+		$iconImage .= '<span class="sr-only">' . Text::_('JDEFAULT') . '</span>';
 	}
 	elseif (substr($iconImage, 0, 6) == 'image:')
 	{
diff --git a/administrator/modules/mod_submenu/Menu/Menu.php b/administrator/modules/mod_submenu/Menu/Menu.php
index 3ff4ec8bd0a8e..6373673a54b87 100644
--- a/administrator/modules/mod_submenu/Menu/Menu.php
+++ b/administrator/modules/mod_submenu/Menu/Menu.php
@@ -169,7 +169,8 @@ public static function preprocess($parent)
 				{
 					if (substr($iconImage, 0, 6) === 'class:' && substr($iconImage, 6) === 'icon-home')
 					{
-						$iconImage = '<span class="home-image icon-featured" aria-hidden="true"></span><span class="sr-only">' . Text::_('JDEFAULT') . '</span>';
+						$iconImage = '<span class="home-image icon-featured" aria-hidden="true"></span>';
+						$iconImage .= '<span class="sr-only">' . Text::_('JDEFAULT') . '</span>';
 					}
 					elseif (substr($iconImage, 0, 6) === 'image:')
 					{