From 13ff3d95a396609aa058428e0c9b4a8e2c557c5b Mon Sep 17 00:00:00 2001
From: Viola Elsenhans <elsenhans@ub.uni-leipzig.de>
Date: Mon, 5 Jun 2023 14:41:35 +0200
Subject: [PATCH] refs #24014 [finc] unification of items in menu.phtml
---
themes/finc/scss/components/_sidebar.scss | 2 +
themes/finc/templates/myresearch/menu.phtml | 56 +++++++++++++--------
2 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/themes/finc/scss/components/_sidebar.scss b/themes/finc/scss/components/_sidebar.scss
index 52cff4c0fc7..a60d19b3bc7 100644
--- a/themes/finc/scss/components/_sidebar.scss
+++ b/themes/finc/scss/components/_sidebar.scss
@@ -283,6 +283,8 @@
// and in newer myaccount menu items
.badge {
font-size: $sidebar-facet-badge-font-size;
+ // use same height for all badges
+ height: 20px;
// remove right padding to align with accordion arrows
padding-right: $sidebar-facet-badge-padding-right;
diff --git a/themes/finc/templates/myresearch/menu.phtml b/themes/finc/templates/myresearch/menu.phtml
index a3c4b72f1ec..cc26123000b 100644
--- a/themes/finc/templates/myresearch/menu.phtml
+++ b/themes/finc/templates/myresearch/menu.phtml
@@ -43,6 +43,7 @@
<?php /* finc needs to add .facet-group class and classes on sub items for borders - CK */ ?>
<?php /* finc: myresearch menu as list #19734 and wraps it in '<nav>' container, CK */ ?>
<?php /* finc: specify current page menu entry in following elements #19941 */ ?>
+<?php /* finc: use <span class="flex-col"> around all <i> and class "flex" for all <a> #24014 */ ?>
<nav class="myresearch-menu">
<ul class="account-menu facet-group">
<?php if ($ilsOnline && $this->ils()->checkCapability('getMyTransactions', $capabilityParams)): ?>
@@ -58,7 +59,7 @@
<?php /* finc: adds media ready to pickup */ ?>
<?php if ($ilsOnline && $this->ils()->checkCapability('getMyMediaReadyToPickup', $capabilityParams) && $routeExists('myresearch-mediareadytopickup')): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-mediareadytopickup')?>" class="flex <?=$this->active == 'mediareadytopickup' ? ' active' : ''?>"
+ <a href="<?=$this->url('myresearch-mediareadytopickup')?>" class="flex<?=$this->active == 'mediareadytopickup' ? ' active' : ''?>"
<?=$this->active == 'mediareadytopickup' ? ' aria-current="page"' : ''?>
>
<span class="flex-col"><i class="fa fa-fw fa-book" aria-hidden="true"></i> <?=$this->transEsc('Ready For Collection')?></span>
@@ -69,7 +70,7 @@
<?php /* finc: adds permanent loans */ ?>
<?php if ($ilsOnline && $this->ils()->checkCapability('getMyPermanentLoans', $capabilityParams) && $routeExists('myresearch-permanentloans')): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-permanentloans')?>" class="flex <?=$this->active == 'permanentloans' ? ' active' : ''?>"
+ <a href="<?=$this->url('myresearch-permanentloans')?>" class="flex<?=$this->active == 'permanentloans' ? ' active' : ''?>"
<?=$this->active == 'permanent' ? ' aria-current="page"' : ''?>
>
<span class="flex-col"><i class="fa fa-fw fa-book" aria-hidden="true"></i> <?=$this->transEsc('Permanent Checked Out Items')?></span>
@@ -131,15 +132,19 @@
<?php endif; ?>
<?php if ($this->overdrive()->showMyContentLink()):?>
<li class="facet">
- <a href="<?=$this->url('overdrive-mycontent')?>"<?=$this->active == 'dgcontent' ? ' class="active"' : ''?>>
- <i class="fa fa-fw fa-download" aria-hidden="true"></i> <?=$this->transEsc('Overdrive Content')?>
+ <a href="<?=$this->url('overdrive-mycontent')?>" class="flex<?=$this->active == 'dgcontent' ? ' active' : ''?>"
+ <?=$this->active == 'dgcontent' ? ' aria-current="page"' : ''?>
+ >
+ <span class="flex-col"><i class="fa fa-fw fa-download" aria-hidden="true"></i> <?=$this->transEsc('Overdrive Content')?></span>
</a>
</li>
<?php endif; ?>
<?php if ($this->accountCapabilities()->getSavedSearchSetting() === 'enabled'): ?>
<li class="facet">
- <a href="<?=$this->url('search-history')?>?require_login"<?=$this->active == 'history' ? ' class="active" aria-current="page"' : ''?>>
- <i class="fa fa-fw fa-search" aria-hidden="true"></i> <?=$this->transEsc('history_saved_searches')?>
+ <a href="<?=$this->url('search-history')?>?require_login" class="flex<?=$this->active == 'history' ? ' active' : ''?>"
+ <?=$this->active == 'history' ? ' aria-current="page"' : ''?>
+ >
+ <span class="flex-col"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <?=$this->transEsc('history_saved_searches')?></span>
</a>
</li>
<?php endif; ?>
@@ -152,27 +157,33 @@
<nav class="myresearch-menu">
<ul class="account-menu facet-group">
<li class="facet">
- <a href="<?=$this->url('myresearch-profile')?>"<?=$this->active == 'profile' ? ' class="active" aria-current="page"' : ''?>>
- <i class="fa fa-fw fa-user" aria-hidden="true"></i> <?=$this->transEsc('Profile')?>
+ <a href="<?=$this->url('myresearch-profile')?>" class="flex<?=$this->active == 'profile' ? ' active' : ''?>"
+ <?=$this->active == 'profile' ? ' aria-current="page"' : ''?>
+ >
+ <span class="flex-col"><i class="fa fa-fw fa-user" aria-hidden="true"></i> <?=$this->transEsc('Profile')?></span>
</a>
</li>
<?php if ($this->auth()->getManager()->supportsPasswordChange() && $routeExists('myresearch-changepassword')): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-changepassword')?>" class="text<?=$this->active == 'newpassword' ? ' active' : ''?>">
- <i class="fa fa-fw fa-lock" aria-hidden="true"></i> <?=$this->transEsc('Change Password')?>
+ <a href="<?=$this->url('myresearch-changepassword')?>" class="flex<?=$this->active == 'newpassword' ? ' active' : ''?>"
+ <?=$this->active == 'newpassword' ? ' aria-current="page"' : ''?>
+ >
+ <span class="flex-col"><i class="fa fa-fw fa-lock" aria-hidden="true"></i> <?=$this->transEsc('Change Password')?></span>
</a>
</li>
<?php endif; ?>
<?php if ($this->ils()->checkCapability('changeUserPin') && $routeExists('myresearch-setpin')): ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-setpin')?>" class="text<?=$this->active == 'setpin' ? ' active' : ''?>">
- <i class="fa fa-fw fa-key" aria-hidden="true"></i> <?=$this->transEsc('LiberoAccount::change_user_pin')?>
+ <a href="<?=$this->url('myresearch-setpin')?>" class="flex<?=$this->active == 'setpin' ? ' active' : ''?>"
+ <?=$this->active == 'setpin' ? ' aria-current="page"' : ''?>
+ >
+ <span class="flex-col"><i class="fa fa-fw fa-key" aria-hidden="true"></i> <?=$this->transEsc('LiberoAccount::change_user_pin')?></span>
</a>
</li>
<?php endif; ?>
<li class="facet">
- <a href="<?=$this->url('myresearch-logout')?>" class="text action">
- <i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> <?=$this->transEsc("Log Out")?>
+ <a href="<?=$this->url('myresearch-logout')?>" class="action flex">
+ <span class="flex-col"><i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> <?=$this->transEsc("Log Out")?></span>
</a>
</li>
</ul>
@@ -187,27 +198,30 @@
<ul class="facet-group">
<li class="facet">
<?php /* finc adds aria-current */ ?>
- <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>
+ <a href="<?=$this->url('myresearch-favorites')?>" class="flex <?=$this->active == 'favorites' ? ' active' : ''?>"
<?=$this->active == 'favorites' ? ' aria-current="page"' : ''?>
>
- <i class="fa fa-fw fa-star" aria-hidden="true"></i> <?=$this->transEsc('Your Favorites')?>
+ <span class="flex-col"><i class="fa fa-fw fa-star" aria-hidden="true"></i> <?=$this->transEsc('Your Favorites')?></span>
</a>
</li>
<?php $lists = $user->getLists() ?>
<?php foreach ($lists as $list): ?>
<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']])?>" class="flex<?=$this->active == 'list' . $list['id'] ? ' active' : ''?>"
<?=$this->active == 'list' . $list['id'] ? ' aria-current="page"' : ''?>
>
- <?=$this->escapeHtml($list['title'])?>
- <?php /* adds '.lists' class to favorites badges for correct styling */ ?>
+ <?php /* finc: add fa-star for all lists */ ?>
+ <span class="flex-col"><i class="fa fa-fw fa-star" aria-hidden="true"></i> <?=$this->escapeHtml($list['title'])?></span>
+ <?php /* finc: adds '.lists' class to favorites badges for correct styling */ ?>
<span class="badge lists"><?=$list->cnt ?></span>
</a>
</li>
<?php endforeach; ?>
<li class="facet">
- <a href="<?=$this->url('editList', ['id' => 'NEW'])?>" <?=$this->active == 'editlist/NEW' ? ' aria-current="page"' : ''?>>
- <i class="fa fa-fw fa-plus" aria-hidden="true"></i> <?=$this->transEsc('Create a List') ?>
+ <a href="<?=$this->url('editList', ['id' => 'NEW'])?>" class="flex<?=$this->active == 'editlist/NEW' ? ' active' : ''?>"
+ <?=$this->active == 'editlist/NEW' ? ' aria-current="page"' : ''?>
+ >
+ <span class="flex-col"><i class="fa fa-fw fa-plus" aria-hidden="true"></i> <?=$this->transEsc('Create a List') ?></span>
</a>
</li>
</ul>
--
GitLab