[5.2] Remove alt-text for menuItem with image and title (#40675)

chmst · web-flow · commit b337054dc8a9 · 2025-01-18T15:04:54.000+01:00
diff --git a/modules/mod_menu/tmpl/default_component.php b/modules/mod_menu/tmpl/default_component.php
@@ -54,11 +54,9 @@
         $image_attributes['class'] = $item->menu_image_css;
     }
 
-    $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
+    $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);
 
-    if ($itemParams->get('menu_text', 1)) {
-        $linktype .= '<span class="image-title">' . $item->title . '</span>';
-    }
+    $linktype .= '<span class="image-title' . ($itemParams->get('menu_text', 1) ? '' : ' visually-hidden') . '">' . $item->title . '</span>';
 }
 
 if ($item->browserNav == 1) {
diff --git a/modules/mod_menu/tmpl/default_heading.php b/modules/mod_menu/tmpl/default_heading.php
@@ -33,7 +33,7 @@
         $image_attributes['class'] = $item->menu_image_css;
     }
 
-    $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
+    $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);
 
     if ($itemParams->get('menu_text', 1)) {
         $linktype .= '<span class="image-title">' . $item->title . '</span>';
diff --git a/modules/mod_menu/tmpl/default_separator.php b/modules/mod_menu/tmpl/default_separator.php
@@ -33,7 +33,7 @@
         $image_attributes['class'] = $item->menu_image_css;
     }
 
-    $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
+    $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);
 
     if ($itemParams->get('menu_text', 1)) {
         $linktype .= '<span class="image-title">' . $item->title . '</span>';
diff --git a/modules/mod_menu/tmpl/default_url.php b/modules/mod_menu/tmpl/default_url.php
@@ -46,11 +46,9 @@
         $image_attributes['class'] = $item->menu_image_css;
     }
 
-    $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
+    $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);
 
-    if ($itemParams->get('menu_text', 1)) {
-        $linktype .= '<span class="image-title">' . $item->title . '</span>';
-    }
+    $linktype .= '<span class="image-title' . ($itemParams->get('menu_text', 1) ? '' : ' visually-hidden') . '">' . $item->title . '</span>';
 }
 
 if ($item->browserNav == 1) {
diff --git a/templates/cassiopeia/html/mod_menu/dropdown-metismenu_component.php b/templates/cassiopeia/html/mod_menu/dropdown-metismenu_component.php
@@ -54,11 +54,9 @@
         $image_attributes['class'] = $item->menu_image_css;
     }
 
-    $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
+    $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);
 
-    if ($itemParams->get('menu_text', 1)) {
-        $linktype .= '<span class="image-title">' . $item->title . '</span>';
-    }
+    $linktype .= '<span class="image-title' . ($itemParams->get('menu_text', 1) ? '' : ' visually-hidden') . '">' . $item->title . '</span>';
 }
 
 if ($item->browserNav == 1) {
diff --git a/templates/cassiopeia/html/mod_menu/dropdown-metismenu_heading.php b/templates/cassiopeia/html/mod_menu/dropdown-metismenu_heading.php
@@ -41,7 +41,7 @@
         $image_attributes['class'] = $item->menu_image_css;
     }
 
-    $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
+    $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);
 
     if ($itemParams->get('menu_text', 1)) {
         $linktype .= '<span class="image-title">' . $item->title . '</span>';
diff --git a/templates/cassiopeia/html/mod_menu/dropdown-metismenu_separator.php b/templates/cassiopeia/html/mod_menu/dropdown-metismenu_separator.php
@@ -41,7 +41,7 @@
         $image_attributes['class'] = $item->menu_image_css;
     }
 
-    $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
+    $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);
 
     if ($itemParams->get('menu_text', 1)) {
         $linktype .= '<span class="image-title">' . $item->title . '</span>';
diff --git a/templates/cassiopeia/html/mod_menu/dropdown-metismenu_url.php b/templates/cassiopeia/html/mod_menu/dropdown-metismenu_url.php
@@ -46,11 +46,9 @@
         $image_attributes['class'] = $item->menu_image_css;
     }
 
-    $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
+    $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);
 
-    if ($itemParams->get('menu_text', 1)) {
-        $linktype .= '<span class="image-title">' . $item->title . '</span>';
-    }
+    $linktype .= '<span class="image-title' . ($itemParams->get('menu_text', 1) ? '' : ' visually-hidden') . '">' . $item->title . '</span>';
 }
 
 if ($item->browserNav == 1) {

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,9 @@`
`54`	`54`	`$image_attributes['class'] = $item->menu_image_css;`
`55`	`55`	`}`
`56`	`56`
`57`		`- $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);`
	`57`	`+ $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);`
`58`	`58`
`59`		`- if ($itemParams->get('menu_text', 1)) {`
`60`		`- $linktype .= '<span class="image-title">' . $item->title . '</span>';`
`61`		`- }`
	`59`	`+ $linktype .= '<span class="image-title' . ($itemParams->get('menu_text', 1) ? '' : ' visually-hidden') . '">' . $item->title . '</span>';`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`if ($item->browserNav == 1) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`$image_attributes['class'] = $item->menu_image_css;`
`34`	`34`	`}`
`35`	`35`
`36`		`- $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);`
	`36`	`+ $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);`
`37`	`37`
`38`	`38`	`if ($itemParams->get('menu_text', 1)) {`
`39`	`39`	`$linktype .= '<span class="image-title">' . $item->title . '</span>';`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,9 @@`
`46`	`46`	`$image_attributes['class'] = $item->menu_image_css;`
`47`	`47`	`}`
`48`	`48`
`49`		`- $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);`
	`49`	`+ $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);`
`50`	`50`
`51`		`- if ($itemParams->get('menu_text', 1)) {`
`52`		`- $linktype .= '<span class="image-title">' . $item->title . '</span>';`
`53`		`- }`
	`51`	`+ $linktype .= '<span class="image-title' . ($itemParams->get('menu_text', 1) ? '' : ' visually-hidden') . '">' . $item->title . '</span>';`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`if ($item->browserNav == 1) {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`$image_attributes['class'] = $item->menu_image_css;`
`42`	`42`	`}`
`43`	`43`
`44`		`- $linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);`
	`44`	`+ $linktype = HTMLHelper::_('image', $item->menu_image, '', $image_attributes);`
`45`	`45`
`46`	`46`	`if ($itemParams->get('menu_text', 1)) {`
`47`	`47`	`$linktype .= '<span class="image-title">' . $item->title . '</span>';`