diff --git a/themes/finc/templates/myresearch/menu.phtml b/themes/finc/templates/myresearch/menu.phtml
index a2348fc565404adbfdcaae793f20c57a52d8b1f2..65978bf3e042238e103e089fd5d9d4765117cd78 100644
--- a/themes/finc/templates/myresearch/menu.phtml
+++ b/themes/finc/templates/myresearch/menu.phtml
@@ -12,7 +12,7 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php if ($this->userlist()->getMode() !== 'disabled'): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active" aria-current="page"' : ''?>>
<i class="fa fa-fw fa-star" aria-hidden="true"></i> <?=$this->transEsc('Favorites')?>
</a>
</li>
@@ -22,7 +22,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php if ($this->ils()->checkCapability('getMyTransactions', $capabilityParams)): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-checkedout')?>" class="flex checkedout<?=$this->active == 'checkedout' ? ' active' : ''?>">
+ <a href="<?=$this->url('myresearch-checkedout')?>" class="flex checkedout<?=$this->active == 'checkedout' ? ' active' : ''?>"
+ <?=$this->active == 'checkedout' ? ' aria-current="page"' : ''?>
+ >
<span class="flex-col"><i class="fa fa-fw fa-book" aria-hidden="true"></i> <?=$this->transEsc('Checked Out Items')?></span>
<span class="checkedout-status status hidden"><i class="fa fa-spin fa-spinner" aria-hidden="true"></i></span>
<?php /* nxt line finc specific - CK */ ?>
@@ -32,7 +34,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php endif; ?>
<?php if ($this->ils()->checkFunction('getMyTransactionHistory', $capabilityParams)): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-historicloans')?>"<?=$this->active == 'historicloans' ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('myresearch-historicloans')?>"<?=$this->active == 'historicloans' ? ' class="active"' : ''?>
+ <?=$this->active == 'historicloans' ? ' aria-current="page"' : ''?>
+ >
<i class="fa fa-fw fa-history" aria-hidden="true"></i> <?=$this->transEsc('Loan History')?>
</a>
</li>
@@ -40,7 +44,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php if ($this->ils()->checkCapability('getMyHolds', $capabilityParams)): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-holds')?>" class="flex<?=$this->active == 'holds' ? ' active' : ''?>">
+ <a href="<?=$this->url('myresearch-holds')?>" class="flex<?=$this->active == 'holds' ? ' active' : ''?>"
+ <?=$this->active == 'holds' ? ' aria-current="page"' : ''?>
+ >
<span class="flex-col"><i class="fa fa-fw fa-flag" aria-hidden="true"></i> <?=$this->transEsc('Holds and Recalls')?></span>
<span class="holds-status status hidden"><i class="fa fa-spin fa-spinner" aria-hidden="true"></i></span>
<?php /* nxt line finc specific - CK */ ?>
@@ -51,7 +57,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php if ($this->ils()->checkFunction('StorageRetrievalRequests', $capabilityParams)): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-storageretrievalrequests')?>" class="flex<?=$this->active == 'storageRetrievalRequests' ? ' active' : ''?>">
+ <a href="<?=$this->url('myresearch-storageretrievalrequests')?>" class="flex<?=$this->active == 'storageRetrievalRequests' ? ' active' : ''?>"
+ <?=$this->active == 'storageRetrievalRequests' ? ' aria-current="page"' : ''?>
+ >
<span class="flex-col"><i class="fa fa-fw fa-archive" aria-hidden="true"></i> <?=$this->transEsc('Storage Retrieval Requests')?></span>
<span class="storageretrievalrequests-status status hidden"><i class="fa fa-spin fa-spinner" aria-hidden="true"></i></span>
<?php /* nxt line finc specific - CK */ ?>
@@ -62,7 +70,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php if ($this->ils()->checkFunction('ILLRequests', $capabilityParams)): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-illrequests')?>" class="flex<?=$this->active == 'ILLRequests' ? ' active' : ''?>">
+ <a href="<?=$this->url('myresearch-illrequests')?>" class="flex<?=$this->active == 'ILLRequests' ? ' active' : ''?>"
+ <?=$this->active == 'ILLRequests' ? ' aria-current="page"' : ''?>
+ >
<span class="flex-col"><i class="fa fa-fw fa-exchange" aria-hidden="true"></i> <?=$this->transEsc('Interlibrary Loan Requests')?></span>
<span class="illrequests-status status hidden"><i class="fa fa-spin fa-spinner" aria-hidden="true"></i></span>
<?php /* nxt line finc specific - CK */ ?>
@@ -73,20 +83,26 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php if ($this->ils()->checkCapability('getMyFines', $capabilityParams)): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-fines')?>" class="flex<?=$this->active == 'fines' ? ' active' : ''?>">
+ <a href="<?=$this->url('myresearch-fines')?>" class="flex<?=$this->active == 'fines' ? ' active' : ''?>"
+ <?=$this->active == 'fines' ? ' aria-current="page"' : ''?>
+ >
<span class="flex-col"><i class="fa fa-fw fa-usd" aria-hidden="true"></i> <?=$this->transEsc('Fines')?></span>
<span class="fines-status status hidden"><i class="fa fa-spin fa-spinner" aria-hidden="true"></i></span>
</a>
</li>
<?php endif; ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-profile')?>"<?=$this->active == 'profile' ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('myresearch-profile')?>"<?=$this->active == 'profile' ? ' class="active"' : ''?>
+ <?=$this->active == 'profile' ? ' aria-current="page"' : ''?>
+ >
<i class="fa fa-fw fa-user" aria-hidden="true"></i> <?=$this->transEsc('Profile')?>
</a>
</li>
<?php if ($user && $user->libraryCardsEnabled()): ?>
<li class="facet">
- <a href="<?=$this->url('librarycards-home')?>"<?=$this->active == 'librarycards' ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('librarycards-home')?>"<?=$this->active == 'librarycards' ? ' class="active"' : ''?>
+ <?=$this->active == 'librarycards' ? ' aria-current="page"' : ''?>
+ >
<i class="fa fa-fw fa-barcode" aria-hidden="true"></i> <?=$this->transEsc('Library Cards')?>
</a>
</li>
@@ -94,7 +110,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php endif; ?>
<?php if ($this->accountCapabilities()->getSavedSearchSetting() === 'enabled'): ?>
<li class="facet">
- <a href="<?=$this->url('search-history')?>?require_login"<?=$this->active == 'history' ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('search-history')?>?require_login"<?=$this->active == 'history' ? ' class="active"' : ''?>
+ <?=$this->active == 'history' ? ' aria-current="page"' : ''?>
+ >
<i class="fa fa-fw fa-search" aria-hidden="true"></i> <?=$this->transEsc('history_saved_searches')?>
</a>
</li>
@@ -112,7 +130,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<h3><?=$this->transEsc('Preferences')?></h3>
<ul class="myresearch-menu facet-group">
<li class="facet">
- <a href="<?=$this->url('myresearch-changepassword')?>"<?=$this->active == 'newpassword' ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('myresearch-changepassword')?>"<?=$this->active == 'newpassword' ? ' class="active"' : ''?>
+ <?=$this->active == 'newpassword' ? ' aria-current="page"' : ''?>
+ >
<i class="fa fa-fw fa-lock" aria-hidden="true"></i> <?=$this->transEsc('Change Password')?>
</a>
</li>
@@ -123,7 +143,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<h3><?=$this->transEsc('Your Lists')?></h3>
<ul class="myresearch-menu facet-group">
<li class="facet">
- <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>
+ <?=$this->active == 'favorites' ? ' aria-current="page"' : ''?>
+ >
<i class="fa fa-fw fa-star" aria-hidden="true"></i> <?=$this->transEsc('Your Favorites')?>
</a>
</li>
@@ -132,7 +154,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php foreach ($lists as $list): ?>
<?php /* finc: keep icon inside + keep braces in badge!; CK*/ ?>
<li class="facet">
- <a href="<?=$this->url('userList', ['id' => $list['id']])?>"<?=$this->active == 'list' . $list['id'] ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('userList', ['id' => $list['id']])?>"<?=$this->active == 'list' . $list['id'] ? ' class="active"' : ''?>
+ <?=$this->active == 'list' . $list['id'] ? ' aria-current="page"' : ''?>
+ >
<i class="fa fa-fw fa-star-o" aria-hidden="true"></i> <?=$this->escapeHtml($list['title'])?>
<span class="badge">(<?=$list->cnt?>)</span>
</a>
@@ -140,7 +164,9 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<?php endforeach; ?>
<li class="facet">
- <a href="<?=$this->url('editList', ['id' => 'NEW'])?>"<?=$this->active == 'editlist/NEW' ? ' class="active"' : ''?>>
+ <a href="<?=$this->url('editList', ['id' => 'NEW'])?>"<?=$this->active == 'editlist/NEW' ? ' class="active"' : ''?>
+ <?=$this->active == 'editlist/NEW' ? ' aria-current="page"' : ''?>
+ >
<i class="fa fa-fw fa-plus" aria-hidden="true"></i> <?=$this->transEsc('Create a List')?>
</a>
</li>