From 27e1257afb691b317e4b8ff48f0b8c983e4bac24 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Fri, 2 Jun 2023 10:17:40 +0000
Subject: [PATCH] replace aria-role with role, fixes #2647
Closes #2647
Merge request studip/studip!1800
---
resources/assets/javascripts/bootstrap/actionmenu.js | 2 +-
resources/assets/stylesheets/print.less | 2 +-
resources/vue/components/StudipActionMenu.vue | 8 ++++----
templates/shared/action-menu.php | 6 +++---
templates/shared/contentgroup-row.php | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/resources/assets/javascripts/bootstrap/actionmenu.js b/resources/assets/javascripts/bootstrap/actionmenu.js
index 8c6db2e2c1b..5cc60214040 100644
--- a/resources/assets/javascripts/bootstrap/actionmenu.js
+++ b/resources/assets/javascripts/bootstrap/actionmenu.js
@@ -42,7 +42,7 @@
STUDIP.ActionMenu.closeAll();
} else if (event.key === 'Tab') {
//Check if the focus is inside an action menu:
- let menu = $(event.target).closest('nav.action-menu');
+ let menu = $(event.target).closest('.action-menu');
if (menu.hasClass('is-open') && STUDIP.ActionMenu.tabThroughItems(menu, event.shiftKey)) {
event.preventDefault();
}
diff --git a/resources/assets/stylesheets/print.less b/resources/assets/stylesheets/print.less
index 46839712b4b..4958fb9f25c 100644
--- a/resources/assets/stylesheets/print.less
+++ b/resources/assets/stylesheets/print.less
@@ -42,7 +42,7 @@ body, input, textarea, td, th, blockquote, p, form, ul, h4 {
#schedule_icons, #edit_inst_entry, #sidebar, #top-bar,
.messagebox_buttons a.close, a.button, button.button,
#sidebar, .helpbar-container, .helpbar,
-#skip_link_navigation, .skip_target, nav.action-menu,
+#skip_link_navigation, .skip_target, .action-menu,
#site-title {
display: none !important;
}
diff --git a/resources/vue/components/StudipActionMenu.vue b/resources/vue/components/StudipActionMenu.vue
index 99fced89fa9..67f44a95736 100644
--- a/resources/vue/components/StudipActionMenu.vue
+++ b/resources/vue/components/StudipActionMenu.vue
@@ -1,5 +1,5 @@
<template>
- <nav v-if="shouldCollapse" class="action-menu">
+ <div v-if="shouldCollapse" class="action-menu">
<button class="action-menu-icon" :title="title" aria-expanded="false">
<span></span>
<span></span>
@@ -30,12 +30,12 @@
</li>
</ul>
</div>
- </nav>
- <nav v-else>
+ </div>
+ <div v-else>
<a v-for="item in navigationItems" :key="item.id" v-bind="linkAttributes(item)" v-on="linkEvents(item)">
<studip-icon :title="item.label" :shape="item.icon.shape" :role="item.icon.role" :size="20"></studip-icon>
</a>
- </nav>
+ </div>
</template>
<script>
diff --git a/templates/shared/action-menu.php b/templates/shared/action-menu.php
index 938aa2c5420..c781f333859 100644
--- a/templates/shared/action-menu.php
+++ b/templates/shared/action-menu.php
@@ -12,8 +12,8 @@
*/
?>
<? // class "action-menu" will be set from API ?>
-<nav <?= arrayToHtmlAttributes($attributes) ?> aria-role="presentation">
- <button class="action-menu-icon" aria-role="button" aria-expanded="false" title="<?= htmlReady($action_menu_title) ?>">
+<div <?= arrayToHtmlAttributes($attributes) ?>>
+ <button class="action-menu-icon" aria-expanded="false" title="<?= htmlReady($action_menu_title) ?>">
<span></span>
<span></span>
<span></span>
@@ -53,4 +53,4 @@
<? endforeach ?>
</ul>
</div>
-</nav>
+</div>
diff --git a/templates/shared/contentgroup-row.php b/templates/shared/contentgroup-row.php
index 7dcc0fc8543..eecb35de56c 100644
--- a/templates/shared/contentgroup-row.php
+++ b/templates/shared/contentgroup-row.php
@@ -1,7 +1,7 @@
<? // class "action-menu" will be set from API ?>
-<nav <?= arrayToHtmlAttributes($attributes) ?> aria-role="presentation">
+<nav <?= arrayToHtmlAttributes($attributes) ?>>
<a class="action-menu-icon" title="<?= htmlReady($label) ?>"
- aria-expanded="false" aria-label="<?= htmlReady($aria_label) ?>" aria-role="button" href="#"
+ aria-expanded="false" aria-label="<?= htmlReady($aria_label) ?>" role="button" href="#"
<?= $image_link_attributes ? arrayToHtmlAttributes($image_link_attributes) : '' ?>>
<?= $image ?>
</a>
--
GitLab