diff --git a/themes/fid/templates/myresearch/menu-additional-entries.phtml b/themes/fid/templates/myresearch/menu-additional-entries.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..0139c66ec6e5c871d42c3325c61a14c4f306f8e4
--- /dev/null
+++ b/themes/fid/templates/myresearch/menu-additional-entries.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+* @author Robert Lange <lange@@ub.uni-leipzig.de>
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+* @link https://vufind.org Main Page
+*/
+?>
+<!-- fid: myresearch - menu-additional-entries.phtml -->
+<?php /* skeleton for additional menu entries */ ?>
+<!-- fid: myresearch - menu-additional-entries.phtml END -->
diff --git a/themes/fid/templates/myresearch/menu.phtml b/themes/fid/templates/myresearch/menu.phtml
index eb49841d91694415d329dee6de5f574d3dec2a3a..b76675dcecb38abefb5d9300615d3a31ce1bf88f 100644
--- a/themes/fid/templates/myresearch/menu.phtml
+++ b/themes/fid/templates/myresearch/menu.phtml
@@ -16,118 +16,121 @@
$patron = $user ? $this->auth()->getILSPatron() : false;
$capabilityParams = $patron ? ['patron' => $patron] : [];
?>
-<h4><?=$this->transEsc('Your Account')?></h4>
-<div class="myresearch-menu account-menu">
- <?php if ('ils-none' !== $this->ils()->getOfflineMode()): ?>
- <?php if ($this->ils()->checkCapability('getMyTransactions', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-checkedout')?>" class="flex checkedout<?=$this->active == 'checkedout' ? ' active' : ''?>">
- <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>
- </a>
- <?php endif; ?>
- <?php if ($this->ils()->checkFunction('getMyTransactionHistory', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-historicloans')?>"<?=$this->active == 'historicloans' ? ' class="active"' : ''?>>
- <i class="fa fa-fw fa-history" aria-hidden="true"></i> <?=$this->transEsc('Loan History')?>
- </a>
- <?php endif; ?>
- <?php if ($this->ils()->checkCapability('getMyHolds', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-holds')?>" class="flex<?=$this->active == 'holds' ? ' active' : ''?>">
- <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>
- </a>
- <?php endif; ?>
- <?php if ($this->ils()->checkFunction('StorageRetrievalRequests', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-storageretrievalrequests')?>" class="flex<?=$this->active == 'storageRetrievalRequests' ? ' active' : ''?>">
- <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>
- </a>
- <?php endif; ?>
- <?php if ($this->ils()->checkFunction('ILLRequests', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-illrequests')?>" class="flex<?=$this->active == 'ILLRequests' ? ' active' : ''?>">
- <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>
- </a>
- <?php endif; ?>
- <?php if ($this->ils()->checkCapability('getMyFines', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-fines')?>" class="flex<?=$this->active == 'fines' ? ' active' : ''?>">
- <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>
- <?php endif; ?>
- <a href="<?=$this->url('myresearch-profile')?>"<?=$this->active == 'profile' ? ' class="active"' : ''?>>
- <i class="fa fa-fw fa-user" aria-hidden="true"></i>
- <?=$this->transEsc('Profile')?>
- </a>
-
- <?php /* refs #15480 add password change to fid profile */ ?>
- <?php if ($this->auth()->isLoggedIn()): ?>
- <a href="<?=$this->url('fid/user/reset-password')?>" data-lightbox>
- <span class="no-padding">
- <i class="fa fa-fw fa-lock" aria-hidden="true"></i>
- </span>
- <?=$this->transEsc('Change Password')?>
- </a>
- <? endif; ?>
-
- <?php if ($this->auth()->isLoggedIn()): ?>
- <a href="<?=$this->url('fid/user/change-username')?>" data-lightbox>
- <span class="no-padding">
- <i class="fa fa-fw fa-envelope" aria-hidden="true"></i>
- </span>
- <?=$this->transEsc('fid::username_change_link')?>
+<?php if (!empty($user)): ?>
+ <h4><?=$this->transEsc('Your Account')?></h4>
+ <div class="myresearch-menu account-menu">
+ <?php if ('ils-none' !== $this->ils()->getOfflineMode()): ?>
+ <?php if ($this->ils()->checkCapability('getMyTransactions', $capabilityParams)): ?>
+ <a href="<?=$this->url('myresearch-checkedout')?>" class="flex checkedout<?=$this->active == 'checkedout' ? ' active' : ''?>">
+ <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>
+ </a>
+ <?php endif; ?>
+ <?php if ($this->ils()->checkFunction('getMyTransactionHistory', $capabilityParams)): ?>
+ <a href="<?=$this->url('myresearch-historicloans')?>"<?=$this->active == 'historicloans' ? ' class="active"' : ''?>>
+ <i class="fa fa-fw fa-history" aria-hidden="true"></i> <?=$this->transEsc('Loan History')?>
+ </a>
+ <?php endif; ?>
+ <?php if ($this->ils()->checkCapability('getMyHolds', $capabilityParams)): ?>
+ <a href="<?=$this->url('myresearch-holds')?>" class="flex<?=$this->active == 'holds' ? ' active' : ''?>">
+ <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>
+ </a>
+ <?php endif; ?>
+ <?php if ($this->ils()->checkFunction('StorageRetrievalRequests', $capabilityParams)): ?>
+ <a href="<?=$this->url('myresearch-storageretrievalrequests')?>" class="flex<?=$this->active == 'storageRetrievalRequests' ? ' active' : ''?>">
+ <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>
+ </a>
+ <?php endif; ?>
+ <?php if ($this->ils()->checkFunction('ILLRequests', $capabilityParams)): ?>
+ <a href="<?=$this->url('myresearch-illrequests')?>" class="flex<?=$this->active == 'ILLRequests' ? ' active' : ''?>">
+ <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>
+ </a>
+ <?php endif; ?>
+ <?php if ($this->ils()->checkCapability('getMyFines', $capabilityParams)): ?>
+ <a href="<?=$this->url('myresearch-fines')?>" class="flex<?=$this->active == 'fines' ? ' active' : ''?>">
+ <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>
+ <?php endif; ?>
+ <a href="<?=$this->url('myresearch-profile')?>"<?=$this->active == 'profile' ? ' class="active"' : ''?>>
+ <i class="fa fa-fw fa-user" aria-hidden="true"></i>
+ <?=$this->transEsc('Profile')?>
</a>
- <? endif; ?>
- <?php if ($user = $this->auth()->isLoggedIn()): ?>
- <span class="logout-button">
- <a href="<?=$this->url('myresearch-logout')?>">
+ <?php /* refs #15480 add password change to fid profile */ ?>
+ <?php if ($this->auth()->isLoggedIn()): ?>
+ <a href="<?=$this->url('fid/user/reset-password')?>" data-lightbox>
<span class="no-padding">
+ <i class="fa fa-fw fa-lock" aria-hidden="true"></i>
+ </span>
+ <?=$this->transEsc('Change Password')?>
+ </a>
+ <? endif; ?>
+
+ <?php if ($this->auth()->isLoggedIn()): ?>
+ <a href="<?=$this->url('fid/user/change-username')?>" data-lightbox>
<span class="no-padding">
- <i class="fa fa-fw fa-sign-out" aria-hidden="true"></i>
+ <i class="fa fa-fw fa-envelope" aria-hidden="true"></i>
</span>
- <?=$this->transEsc("Logout")?>
+ <?=$this->transEsc('fid::username_change_link')?>
</a>
- </span>
- <? endif; ?>
+ <? endif; ?>
- <?php if ($user && $user->libraryCardsEnabled()): ?>
- <a href="<?=$this->url('librarycards-home')?>"<?=$this->active == 'librarycards' ? ' class="active"' : ''?>>
- <i class="fa fa-fw fa-barcode" aria-hidden="true"></i> <?=$this->transEsc('Library Cards')?>
- </a>
+ <?php if ($user = $this->auth()->isLoggedIn()): ?>
+ <span class="logout-button">
+ <a href="<?=$this->url('myresearch-logout')?>">
+ <span class="no-padding">
+ <span class="no-padding">
+ <i class="fa fa-fw fa-sign-out" aria-hidden="true"></i>
+ </span>
+ <?=$this->transEsc("Logout")?>
+ </a>
+ </span>
+ <? endif; ?>
+
+ <?php if ($user && $user->libraryCardsEnabled()): ?>
+ <a href="<?=$this->url('librarycards-home')?>"<?=$this->active == 'librarycards' ? ' class="active"' : ''?>>
+ <i class="fa fa-fw fa-barcode" aria-hidden="true"></i> <?=$this->transEsc('Library Cards')?>
+ </a>
+ <?php endif; ?>
<?php endif; ?>
- <?php endif; ?>
-</div>
+ </div>
-<br />
-<?php if ($user && $this->userlist()->getMode() !== 'disabled'): ?>
- <h4><?=$this->transEsc('Your Lists')?></h4>
+ <br />
+ <?php if ($user && $this->userlist()->getMode() !== 'disabled'): ?>
+ <h4><?=$this->transEsc('Your Lists')?></h4>
- <div class="myresearch-menu">
- <?php if ($this->accountCapabilities()->getSavedSearchSetting() === 'enabled'): ?>
- <a href="<?=$this->url('search-history')?>?require_login"<?=$this->active == 'history' ? ' class="active"' : ''?>>
- <i class="fa fa-fw fa-search" aria-hidden="true"></i> <?=$this->transEsc('history_saved_searches')?>
+ <div class="myresearch-menu">
+ <?php if ($this->accountCapabilities()->getSavedSearchSetting() === 'enabled'): ?>
+ <a href="<?=$this->url('search-history')?>?require_login"<?=$this->active == 'history' ? ' class="active"' : ''?>>
+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <?=$this->transEsc('history_saved_searches')?>
+ </a>
+ <?php endif; ?>
+ <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>>
+ <i class="fa fa-fw fa-star" aria-hidden="true"></i> <?=$this->transEsc('Your Favorites')?>
</a>
- <?php endif; ?>
- <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>>
- <i class="fa fa-fw fa-star" aria-hidden="true"></i> <?=$this->transEsc('Your Favorites')?>
- </a>
- <?php $lists = $user->getLists() ?>
- <?php foreach ($lists as $list): ?>
- <a href="<?=$this->url('userList', ['id' => $list['id']])?>"<?=$this->active == 'list' . $list['id'] ? ' class="active"' : ''?>>
- <?=$this->escapeHtml($list['title'])?>
- <span class="badge"><?=$list->cnt ?></span>
+ <?php $lists = $user->getLists() ?>
+ <?php foreach ($lists as $list): ?>
+ <a href="<?=$this->url('userList', ['id' => $list['id']])?>"<?=$this->active == 'list' . $list['id'] ? ' class="active"' : ''?>>
+ <?=$this->escapeHtml($list['title'])?>
+ <span class="badge"><?=$list->cnt ?></span>
+ </a>
+ <?php endforeach; ?>
+ <a href="<?=$this->url('editList', ['id' => 'NEW'])?>">
+ <i class="fa fa-fw fa-plus" aria-hidden="true"></i> <?=$this->transEsc('Create a List') ?>
</a>
- <?php endforeach; ?>
- <a href="<?=$this->url('editList', ['id' => 'NEW'])?>">
- <i class="fa fa-fw fa-plus" aria-hidden="true"></i> <?=$this->transEsc('Create a List') ?>
- </a>
+ <?=$this->context($this)->renderInContext('myresearch/menu-additional-entries.phtml', array())?>
+ </div>
+ <?php endif ?>
+ <?php if ($this->permission()->allowDisplay('fid.ReadList')): ?>
+ <br/>
+ <h4><?=$this->transEsc('fid::admin_section')?></h4>
+ <div class="myresearch-menu">
+ <a href="<?=$this->url('fid/admin/list')?>"><?=$this->transEsc('fid::permission_read_user_list')?></a>
+ <?php endif; ?>
</div>
-<?php endif ?>
-<?php if ($this->permission()->allowDisplay('fid.ReadList')): ?>
-<br/>
-<h4><?=$this->transEsc('fid::admin_section')?></h4>
-<div class="myresearch-menu">
- <a href="<?=$this->url('fid/admin/list')?>"><?=$this->transEsc('fid::permission_read_user_list')?></a>
+ <!-- fid: myresearch - menu.phtml END -->
<?php endif; ?>
-</div>
-<!-- fid: myresearch - menu.phtml END -->