From 2b1e47e2a2a5a31a0fc5039ed7dbb192a4a51dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Leopoldo=20Sologuren=20Guti=C3=A9rrez?=
 <fsologureng@users.noreply.github.com>
Date: Sat, 28 Jan 2023 22:29:10 -0300
Subject: [PATCH] Improve accessibility of navigation bar and footer (#22635)

Added ARIA navigation landmark to navigation bar and aria label for both
nav bar and footer.

Contributed by @forgejo.

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
---
 options/locale/locale_en-US.ini    | 6 ++++++
 templates/base/footer_content.tmpl | 6 +++---
 templates/base/head_navbar.tmpl    | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 6ccbbc1c01..98922db808 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -111,6 +111,12 @@ never = Never
 
 rss_feed = RSS Feed
 
+[aria]
+navbar = Navigation Bar
+footer = Footer
+footer.software = About Software
+footer.links = Links
+
 [filter]
 string.asc = A - Z
 string.desc = Z - A
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index 89be609225..c3b96a0245 100644
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -1,6 +1,6 @@
-<footer>
+<footer role="group" aria-label="{{.locale.Tr "aria.footer"}}">
 	<div class="ui container">
-		<div class="ui left">
+		<div class="ui left" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
 			<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.locale.Tr "powered_by" "Gitea"}}</a>
 			{{if (or .ShowFooterVersion .PageIsAdmin)}}
 				{{.locale.Tr "version"}}:
@@ -15,7 +15,7 @@
 				{{.locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
 			{{end}}
 		</div>
-		<div class="ui right links">
+		<div class="ui right links" role="group" aria-label="{{.locale.Tr "aria.footer.links"}}">
 			{{if .ShowFooterBranding}}
 				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea">{{svg "octicon-mark-github"}}<span class="sr-only">GitHub</span></a>
 			{{end}}
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 3c4670e418..90a54608e6 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -1,4 +1,4 @@
-<div class="ui container" id="navbar">
+<div class="ui container" id="navbar" role="navigation" aria-label="{{.locale.Tr "aria.navbar"}}">
 	{{$notificationUnreadCount := 0}}
 	{{if .IsSigned}}
 		{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}