From 4d7ff32c81c7547e2d96fb83417e3676cf5e6c58 Mon Sep 17 00:00:00 2001
From: Helen Chong <119173961+helenclx@users.noreply.github.com>
Date: Sun, 14 Jul 2024 11:58:34 +0800
Subject: [PATCH] Use visually hidden and aria-labelledby to label landmarks

---
 src/_includes/global/content.njk           | 6 ++++--
 src/_includes/global/footer.njk            | 4 ++--
 src/_includes/global/navbar.njk            | 6 ++++--
 src/_includes/global/pagination-oldnew.njk | 5 +++--
 src/_includes/global/shrineinfo.njk        | 2 +-
 src/_includes/main/changelogs.njk          | 4 ++--
 src/_includes/main/content-nav.njk         | 4 ++--
 src/_includes/main/links.njk               | 3 ++-
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/_includes/global/content.njk b/src/_includes/global/content.njk
index 3bda6ec9..7e838ffe 100644
--- a/src/_includes/global/content.njk
+++ b/src/_includes/global/content.njk
@@ -1,6 +1,7 @@
 <header class="main__header">
     {% if isArticle or hasBreadcrumbs %}
-        <nav aria-label="Breadcrumbs">
+        <nav aria-labelledby="breadcrumbs-title">
+            <h2 class="visually-hidden" id="breadcrumbs-title">Breadcrumbs</h2>
             <ol class="breadcrumbs">
                 {% set breadcrumbNavPages = collections.all | eleventyNavigationBreadcrumb(articleTitle or pageTitle or title) %}
                 {%- for entry in breadcrumbNavPages %}
@@ -47,7 +48,8 @@
         {{ content | safe }}
 
     {% if tags and tags.includes("posts") %}
-        <nav class="blog__post--pagination" aria-label="Next and Previous Blog Posts">
+        <nav class="blog__post--pagination" aria-labelledby="nextprev-title">
+            <h2 class="visually-hidden" id="nextprev-title">Next and Previous Blog Posts</h2>
             {%- if collections.posts %}
                 {%- set previousPost = collections.posts | getPreviousCollectionItem %}
                 {%- set nextPost = collections.posts | getNextCollectionItem %}
diff --git a/src/_includes/global/footer.njk b/src/_includes/global/footer.njk
index 93783b8d..efc2e112 100644
--- a/src/_includes/global/footer.njk
+++ b/src/_includes/global/footer.njk
@@ -4,8 +4,8 @@
 {% endblock -%}
 
 {%- if tags and tags.includes("shrine pages") %}
-    <nav class="footer__shrines">
-        <p>Back to:</p>
+    <nav class="footer__shrines" aria-labelledby="backto-title">
+        <p id="backto-title">Back to:</p>
         <ul class="footer__links">
             <li><a href="/shrines/">Shrine Directory</a></li>
             <li><a href="/">{{ sitemeta.siteName }}</a></li>
diff --git a/src/_includes/global/navbar.njk b/src/_includes/global/navbar.njk
index ed28ff49..ab641816 100644
--- a/src/_includes/global/navbar.njk
+++ b/src/_includes/global/navbar.njk
@@ -14,7 +14,8 @@ https://kalechips.net/projects/snippets/burger #}
 {%- endif -%}
 {% endset %}
 
-<nav class="navbar" aria-label="Top level">
+<nav class="navbar" aria-labelledby="top-level-nav-title">
+    <h2 class="visually-hidden" id="top-level-nav-title">Top Level Navigation Bar</h2>
     <details class="navbar__burger">
         <summary class="navbar__toggle" id="toggle">
             <svg aria-hidden="true" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -22,7 +23,8 @@ https://kalechips.net/projects/snippets/burger #}
             </svg>
             Navigation
         </summary>
-        <nav class="navbar__menu" aria-label="Top level hamburger menu">
+        <nav class="navbar__menu" aria-labelledby="hamburger-nav-title">
+            <h3 class="visually-hidden" id="hamburger-nav-title">Hamburger Menu</h3>
             <ul class="navbar__menu--links">
                 {{ navLinksEl | safe }}
                 <li class="skip"><a href="#toggle">Close Menu</a></li>
diff --git a/src/_includes/global/pagination-oldnew.njk b/src/_includes/global/pagination-oldnew.njk
index f22cdc46..6634193b 100644
--- a/src/_includes/global/pagination-oldnew.njk
+++ b/src/_includes/global/pagination-oldnew.njk
@@ -3,11 +3,12 @@
 {% set nextLabel = "Older" %}
 {% set lastLabel = "Oldest" %}
 
-<nav aria-label="pagination" class="pagination__wrapper">
+<nav aria-labelledby="pagination-title" class="pagination__wrapper">
+    <h2 class="visually-hidden" id="pagination-title">Pagination</h2>
     <ul class="pagination">
         <li>
             {% if pagination.href.first %}
-                <a href=" {{ pagination.href.first }}">
+                <a href="{{ pagination.href.first }}">
                     <i class="fa-solid fa-angles-left"></i>
                     {{ firstLabel }}
                 </a>
diff --git a/src/_includes/global/shrineinfo.njk b/src/_includes/global/shrineinfo.njk
index 037cf5fd..94b0763e 100644
--- a/src/_includes/global/shrineinfo.njk
+++ b/src/_includes/global/shrineinfo.njk
@@ -1,4 +1,4 @@
-<aside class="right-sidebar">
+<aside class="right-sidebar" aria-label="Right sidebar">
     <div class="shrine__info sidebar--sticky">
         <h2>About</h2>
         {% block shrineAbout %}
diff --git a/src/_includes/main/changelogs.njk b/src/_includes/main/changelogs.njk
index 49c3b3f9..690ed7cb 100644
--- a/src/_includes/main/changelogs.njk
+++ b/src/_includes/main/changelogs.njk
@@ -5,8 +5,8 @@ articleElement: true
 
 {% set currentUrl %}{{ page.url }}{% endset %}
 
-<nav class="changelog__nav">
-    <p class="changelog__nav--title">Changelog Archive:</p>
+<nav class="changelog__nav" aria-labelledby="changelog-nav-title">
+    <p class="changelog__nav--title" id="changelog-nav-title">Changelog Archive:</p>
     <ul class="changelog__nav--links">
         <li><a
             {% if currentUrl === "/changelogs/" %}aria-current="page"{% endif %}
diff --git a/src/_includes/main/content-nav.njk b/src/_includes/main/content-nav.njk
index 750d9462..3bde29e6 100644
--- a/src/_includes/main/content-nav.njk
+++ b/src/_includes/main/content-nav.njk
@@ -1,6 +1,6 @@
 <aside class="right-sidebar" aria-label="Right sidebar">
-    <nav class="content__nav sidebar--sticky" aria-labelledby="my-contents">
-        <h2 class="content__nav--title" id="my-contents">My Contents</h2>
+    <nav class="content__nav sidebar--sticky" aria-labelledby="my-contents-title">
+        <h2 class="content__nav--title" id="my-contents-title">My Contents</h2>
         <ul class="content__nav--links">
             {% for archive in collections.archive %}
                 <li><a href="{{ archive.url }}">{{ archive.data.title }}</a></li>
diff --git a/src/_includes/main/links.njk b/src/_includes/main/links.njk
index ea0715a4..8052a0f7 100644
--- a/src/_includes/main/links.njk
+++ b/src/_includes/main/links.njk
@@ -14,7 +14,8 @@ isContentDivided: true
     <h2>Links by Category</h2>
 
     <p>Use the following tabs to view my link collection by category.</p>
-    <nav>
+    <nav aria-labelledby="tabs-title">
+        <h3 class="visually-hidden" id="tabs-title">Tabs Group</h3>
         <ul class="tabs">
         {% for group in linkGroups %}
             <li><a class="tab__btn" href="#{{ group.data.title | slugify }}">{{ group.data.title }}</a></li>