From 32ef823d34cdce84d25ef7f8268343b8982d5b55 Mon Sep 17 00:00:00 2001
From: eclipse <eclipse@unterdemradar.de>
Date: Wed, 19 Feb 2025 09:50:15 +0100
Subject: [PATCH] fixed a bug where all links under an aria-current="page"
 submenu heading would be underlined

---
 theme/static/css/custom.css          | 3 ++-
 theme/templates/includes/navbar.html | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/theme/static/css/custom.css b/theme/static/css/custom.css
index 34dfae7..6d5fdff 100644
--- a/theme/static/css/custom.css
+++ b/theme/static/css/custom.css
@@ -183,7 +183,8 @@ a {
       padding-right: 0;
     }
 
-    li[aria-current=page] a {
+    li[aria-current=page]>a,
+    li[aria-current=page]>details>summary>a {
       text-decoration: underline;
     }
 
diff --git a/theme/templates/includes/navbar.html b/theme/templates/includes/navbar.html
index 9ece676..9179e70 100644
--- a/theme/templates/includes/navbar.html
+++ b/theme/templates/includes/navbar.html
@@ -9,12 +9,14 @@
   <ul id="main-menu-items" role="list">
     {% for title, link in MENUITEMS %}
     {% if link is iterable and link is not string %}{% set submenu = true %}{% endif %}
-    <li role="listitem"{% if output_file[-10:] == "index.html" and (output_file[:-10] == link or (submenu and output_file[:-10] == link[0][1])) %} aria-current="page"{% endif %}>
+    {# aria-current tells the browser which menu link corresponds to the current page #}
+    <li role="listitem"{% if output_file[-10:] == "index.html" and (output_file[:-10] == link or (submenu and output_file[:-10] == link[0][1])) %} aria-current="page"{% endif %}{% if submenu %} aria-haspopup="menu"{% endif %}>
       {% if submenu %}
       <details class="dropdown">
         <summary><a href="{{ SITEURL }}/{{ link[0][1]}}">{{ title }}</a></summary>
         <ul>
         {% for t, l in link %}
+          {# skip first submenu entry as it contains only the link for the summary (which has already been set) #}
           {% if not loop.first %}
           <li role="listitem"{% if output_file[-10:] == "index.html" and output_file[:-10] == l %} aria-current="page"{% endif %}><a href="{{ SITEURL }}/{{ l }}">{{ t }}</a></li>
           {% endif %}