diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index f225ac9b883d6d17fb55761d494c0673d47fdc47..aff100fad7a0b2991b8ca79393ff637832ec2612 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -2079,16 +2079,16 @@ footer {
.search-filter-toggle::before {
content: '\f100\00a0';
}
-}
-.offcanvas-left .record {
- .media-left.img-col {
- // push record view icon to right (Desktop) on left-aligned sidebars -- pls NOTE: required offcanvas = true
- @media (min-width: $screen-sm-min) {
- float: right;
- margin-left: $grid-gutter-width / 2;
- margin-right: 0;
- padding-right: 0;
+ .record {
+ .media-left.img-col {
+ // push record view icon to right (Desktop) on left-aligned sidebars -- pls NOTE: required offcanvas = true
+ @media (min-width: $screen-sm-min) {
+ float: right;
+ margin-left: $grid-gutter-width / 2;
+ margin-right: 0;
+ padding-right: 0;
+ }
}
}
}
@@ -2708,11 +2708,18 @@ body:not(.offcanvas) .sidebar {
//// Style myaccount sidebar menues to get the same look as facets
.myresearch-menu {
- border: 1px solid $border-color;
- a:not(:last-of-type) {
- border-bottom: 1px solid $border-color;
- padding: $sidebar-item-padding; // overwrite values from BS with more sensible values
+ a {
+ width: 100%;
+
+ &:not(:last-of-type) {
+ border-bottom: 1px solid $border-color;
+ padding: $sidebar-item-padding; // overwrite values from BS with more sensible values
+ }
+ }
+
+ .facet {
+ padding: 0 !important;
}
}
@@ -2738,6 +2745,11 @@ body:not(.offcanvas) .sidebar {
}
}
+ > li {
+ margin: 0;
+ padding: 0;
+ }
+
////// Pull exclude facets to the right, align with accordion/collapse triangles and headings
.facet.excludable {
padding-left: 1.5em;
@@ -2759,8 +2771,8 @@ body:not(.offcanvas) .sidebar {
//// Offcanvas is used to widths of 767px ($screen-xs-max)
-@media (max-width: $screen-xs-max) {
- .offcanvas.active .sidebar {
+.offcanvas.active .sidebar {
+ @media (max-width: $screen-xs-max) {
padding-right: ($grid-gutter-width / 2);
}
}
@@ -2828,10 +2840,28 @@ body:not(.offcanvas) .sidebar {
-ms-word-break: break-all;
word-break: break-all; // fallback for hyphens: auto (Chrome on Desktop and bug on Mozilla for capitalized words)
+ a,
.text {
-ms-word-break: break-word;
word-break: break-word;
}
+
+ a {
+ text-decoration: none;
+ }
+ }
+
+ // special case: on sm-size AND search result facats
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ & div[id^='side-panel-'] {
+ .facet {
+ a,
+ .text {
+ -ms-word-break: initial;
+ word-break: initial;
+ }
+ }
+ }
}
}
@@ -2878,6 +2908,8 @@ body:not(.offcanvas) .sidebar {
&.overdue {
.myresearch-menu & {
color: $white;
+ // unset height attribute from .facet .badge {} definition for better looks
+ max-height: unset;
padding: 3px 7px;
}
}
@@ -3257,13 +3289,12 @@ input {
// CHANNELS
-
-.slick-arrow:not(.slick-disabled).slick-next:focus:before,
-.slick-arrow:not(.slick-disabled).slick-next:hover:before,
-.slick-arrow:not(.slick-disabled).slick-prev:focus:before,
-.slick-arrow:not(.slick-disabled).slick-prev:hover:before {
- color: $slick-arrow-hover-color;
- outline: 2px $black dotted;
+.slick-arrow:not(.slick-disabled).slick-next,
+.slick-arrow:not(.slick-disabled).slick-prev {
+ &:focus::before,
+ &:hover::before {
+ color: $slick-arrow-hover-color;
+ outline: 2px $black dotted;
+ }
}
-
// CHANNELS - END
diff --git a/themes/finc/templates/myresearch/menu.phtml b/themes/finc/templates/myresearch/menu.phtml
index 32dd7c7cc725e4eb4a729bd3695345644e61b83c..a2348fc565404adbfdcaae793f20c57a52d8b1f2 100644
--- a/themes/finc/templates/myresearch/menu.phtml
+++ b/themes/finc/templates/myresearch/menu.phtml
@@ -8,114 +8,144 @@ $capabilityParams = $patron ? ['patron' => $patron] : [];
<h2><?=$this->transEsc('Your Account')?></h2>
<?php /* finc needs to add .facet-group class and classes on sub items for borders - CK */ ?>
-<div class="myresearch-menu account-menu facet-group">
+<ul class="myresearch-menu account-menu facet-group">
<?php if ($this->userlist()->getMode() !== 'disabled'): ?>
- <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>>
+ <li class="facet">
+ <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>>
<i class="fa fa-fw fa-star" aria-hidden="true"></i> <?=$this->transEsc('Favorites')?>
</a>
+ </li>
<?php endif; ?>
<?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>
- <?php /* nxt line finc specific - CK */ ?>
- <span id="getMyTransactions" class="itemCount pull-right no-padding"></span>
- </a>
+ <li class="facet">
+ <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>
+ <?php /* nxt line finc specific - CK */ ?>
+ <span id="getMyTransactions" class="itemCount pull-right no-padding"></span>
+ </a>
+ </li>
<?php endif; ?>
<?php if ($this->ils()->checkFunction('getMyTransactionHistory', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-historicloans')?>"<?=$this->active == 'historicloans' ? ' class="active"' : ''?>>
+ <li class="facet">
+ <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>
+ </li>
<?php endif; ?>
<?php if ($this->ils()->checkCapability('getMyHolds', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-holds')?>" class="flex<?=$this->active == 'holds' ? ' active' : ''?>">
+ <li class="facet">
+ <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>
<?php /* nxt line finc specific - CK */ ?>
<span id="getMyHolds" class="itemCount pull-right no-padding"></span>
</a>
+ </li>
<?php endif; ?>
<?php if ($this->ils()->checkFunction('StorageRetrievalRequests', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-storageretrievalrequests')?>" class="flex<?=$this->active == 'storageRetrievalRequests' ? ' active' : ''?>">
+ <li class="facet">
+ <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>
<?php /* nxt line finc specific - CK */ ?>
<span id="getMyStorageRetrievalRequests" class="itemCount pull-right no-padding"></span>
</a>
+ </li>
<?php endif; ?>
<?php if ($this->ils()->checkFunction('ILLRequests', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-illrequests')?>" class="flex<?=$this->active == 'ILLRequests' ? ' active' : ''?>">
+ <li class="facet">
+ <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>
<?php /* nxt line finc specific - CK */ ?>
<span id="getMyILLRequests" class="itemCount pull-right no-padding"></span>
</a>
+ </li>
<?php endif; ?>
<?php if ($this->ils()->checkCapability('getMyFines', $capabilityParams)): ?>
- <a href="<?=$this->url('myresearch-fines')?>" class="flex<?=$this->active == 'fines' ? ' active' : ''?>">
+ <li class="facet">
+ <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>
+ </li>
<?php endif; ?>
- <a href="<?=$this->url('myresearch-profile')?>"<?=$this->active == 'profile' ? ' class="active"' : ''?>>
+ <li class="facet">
+ <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>
+ </li>
<?php if ($user && $user->libraryCardsEnabled()): ?>
- <a href="<?=$this->url('librarycards-home')?>"<?=$this->active == 'librarycards' ? ' class="active"' : ''?>>
+ <li class="facet">
+ <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>
+ </li>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->accountCapabilities()->getSavedSearchSetting() === 'enabled'): ?>
- <a href="<?=$this->url('search-history')?>?require_login"<?=$this->active == 'history' ? ' class="active"' : ''?>>
+ <li class="facet">
+ <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>
+ </li>
<?php endif; ?>
<?php if ($user): ?>
- <a href="<?=$this->url('myresearch-logout')?>">
+ <li class="facet">
+ <a href="<?=$this->url('myresearch-logout')?>">
<i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> <?=$this->transEsc("Log Out")?>
</a>
+ </li>
<?php endif; ?>
-</div>
+</ul>
<?php if ($this->auth()->isLoggedIn() && $this->auth()->getManager()->supportsPasswordChange()): ?>
<h3><?=$this->transEsc('Preferences')?></h3>
- <div class="myresearch-menu facet-group">
- <a href="<?=$this->url('myresearch-changepassword')?>"<?=$this->active == 'newpassword' ? ' class="active"' : ''?>>
+ <ul class="myresearch-menu facet-group">
+ <li class="facet">
+ <a href="<?=$this->url('myresearch-changepassword')?>"<?=$this->active == 'newpassword' ? ' class="active"' : ''?>>
<i class="fa fa-fw fa-lock" aria-hidden="true"></i> <?=$this->transEsc('Change Password')?>
</a>
- </div>
+ </li>
+ </ul>
<?php endif; ?>
<?php if ($user && $this->userlist()->getMode() !== 'disabled'): ?>
<h3><?=$this->transEsc('Your Lists')?></h3>
- <div class="myresearch-menu facet-group">
- <a href="<?=$this->url('myresearch-favorites')?>"<?=$this->active == 'favorites' ? ' class="active"' : ''?>>
+ <ul class="myresearch-menu facet-group">
+ <li class="facet">
+ <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>
+ </li>
<?php $lists = $user->getLists() ?>
<?php foreach ($lists as $list): ?>
<?php /* finc: keep icon inside + keep braces in badge!; CK*/ ?>
- <a href="<?=$this->url('userList', ['id' => $list['id']])?>"<?=$this->active == 'list' . $list['id'] ? ' class="active"' : ''?>>
+ <li class="facet">
+ <a href="<?=$this->url('userList', ['id' => $list['id']])?>"<?=$this->active == 'list' . $list['id'] ? ' class="active"' : ''?>>
<i class="fa fa-fw fa-star-o" aria-hidden="true"></i> <?=$this->escapeHtml($list['title'])?>
<span class="badge">(<?=$list->cnt?>)</span>
</a>
+ </li>
<?php endforeach; ?>
- <a href="<?=$this->url('editList', ['id' => 'NEW'])?>"<?=$this->active == 'editlist/NEW' ? ' class="active"' : ''?>>
+ <li class="facet">
+ <a href="<?=$this->url('editList', ['id' => 'NEW'])?>"<?=$this->active == 'editlist/NEW' ? ' class="active"' : ''?>>
<i class="fa fa-fw fa-plus" aria-hidden="true"></i> <?=$this->transEsc('Create a List')?>
</a>
+ </li>
- </div>
+ </ul>
<?php endif ?>
<?php /* finc: This script is finc-specific - CK */ ?>
<?php $script = <<<JS