From 89db19534ef58eeb659dad43f58ec7fbbe1728cb Mon Sep 17 00:00:00 2001
From: Israel Cefrin <israel.cefrin@gmail.com>
Date: Thu, 4 Jan 2024 23:03:28 -0500
Subject: [PATCH] pkp/pkp-lib#6296 Article breadcrumbs use aria  - OJS 3.4

---
 .../components/breadcrumbs_article.tpl         | 18 +++++++++---------
 .../frontend/components/breadcrumbs_issue.tpl  | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/templates/frontend/components/breadcrumbs_article.tpl b/templates/frontend/components/breadcrumbs_article.tpl
index 0092bcf810b..50fafdcd31c 100644
--- a/templates/frontend/components/breadcrumbs_article.tpl
+++ b/templates/frontend/components/breadcrumbs_article.tpl
@@ -14,37 +14,37 @@
  * @uses $currentTitleKey string Translation key for title of current page.
  * @uses $issue Issue Issue this article was published in.
  *}
-
-<nav class="cmp_breadcrumbs" role="navigation" aria-label="{translate key="navigation.breadcrumbLabel"}">
+{assign var=articlePath value=$publication->getData('urlPath')|default:$article->getId()}
+<nav class="cmp_breadcrumbs" aria-label="{translate key="navigation.breadcrumbLabel"}">
 	<ol>
 		<li>
 			<a href="{url page="index" router=\PKP\core\PKPApplication::ROUTE_PAGE}">
 				{translate key="common.homepageNavigationLabel"}
 			</a>
-			<span class="separator">{translate key="navigation.breadcrumbSeparator"}</span>
+			<span class="separator" aria-hidden="true">{translate key="navigation.breadcrumbSeparator"}</span>
 		</li>
 		<li>
 			<a href="{url router=\PKP\core\PKPApplication::ROUTE_PAGE page="issue" op="archive"}">
 				{translate key="navigation.archives"}
 			</a>
-			<span class="separator">{translate key="navigation.breadcrumbSeparator"}</span>
+			<span class="separator" aria-hidden="true">{translate key="navigation.breadcrumbSeparator"}</span>
 		</li>
 		{if $issue}
 			<li>
 				<a href="{url page="issue" op="view" path=$issue->getBestIssueId()}">
 					{$issue->getIssueIdentification()}
 				</a>
-				<span class="separator">{translate key="navigation.breadcrumbSeparator"}</span>
+				<span class="separator" aria-hidden="true">{translate key="navigation.breadcrumbSeparator"}</span>
 			</li>
 		{/if}
-		<li class="current" aria-current="page">
-			<span aria-current="page">
+		<li class="current">
+			<a href="{url page="article" op="view" path=$articlePath}" current="page">
 				{if $currentTitleKey}
 					{translate key=$currentTitleKey}
 				{else}
-					{$currentTitle|escape}
+					{$publication->getLocalizedTitle(null, 'html')|strip_unsafe_html}
 				{/if}
-			</span>
+			</a>
 		</li>
 	</ol>
 </nav>
diff --git a/templates/frontend/components/breadcrumbs_issue.tpl b/templates/frontend/components/breadcrumbs_issue.tpl
index d15bd7c7c28..eccf6c6e8a9 100644
--- a/templates/frontend/components/breadcrumbs_issue.tpl
+++ b/templates/frontend/components/breadcrumbs_issue.tpl
@@ -14,28 +14,28 @@
  * @uses $currentTitleKey string Translation key for title of current page.
  *}
 
-<nav class="cmp_breadcrumbs" role="navigation" aria-label="{translate key="navigation.breadcrumbLabel"}">
+<nav class="cmp_breadcrumbs" aria-label="{translate key="navigation.breadcrumbLabel"}">
 	<ol>
 		<li>
 			<a href="{url page="index" router=\PKP\core\PKPApplication::ROUTE_PAGE}">
 				{translate key="common.homepageNavigationLabel"}
 			</a>
-			<span class="separator">{translate key="navigation.breadcrumbSeparator"}</span>
+			<span class="separator" aria-hidden="true">{translate key="navigation.breadcrumbSeparator"}</span>
 		</li>
 		<li>
 			<a href="{url router=\PKP\core\PKPApplication::ROUTE_PAGE page="issue" op="archive"}">
 				{translate key="navigation.archives"}
 			</a>
-			<span class="separator">{translate key="navigation.breadcrumbSeparator"}</span>
+			<span class="separator" aria-hidden="true">{translate key="navigation.breadcrumbSeparator"}</span>
 		</li>
-		<li class="current" aria-current="page">
-			<span aria-current="page">
+		<li class="current">
+			<a href="{url op="view" path=$issue->getBestIssueId()}" aria-current="page">
 				{if $currentTitleKey}
 					{translate key=$currentTitleKey}
 				{else}
 					{$currentTitle|escape}
 				{/if}
-			</span>
+			</a>
 		</li>
 	</ol>
 </nav>