refs #7347:

* some more core update fixes for finc
* removed bootstrap js function call tab() in record.js

themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml

@@ -172,7 +172,7 @@
         <? /* Add to favorites */ ?>
        <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>" title="<?=$this->transEsc('Add to favorites')?>"><i class="fa fa-fw fa-star"></i> <?=$this->transEsc('Add to favorites')?></a><br/>
         <? /* Saved lists */ ?>
-        <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="alertdialog">
+        <div class="savedLists alert-box info hide" data-alert tabindex="0" aria-live="assertive" role="alertdialog">
           <strong><?=$this->transEsc("Saved in")?>:</strong>
         </div>
       <? endif; ?>
@@ -183,9 +183,9 @@
           <div class="hierarchyTreeLink">
             <input type="hidden" value="<?=$this->escapeHtmlAttr($hierarchyID)?>" class="hiddenHierarchyId" />
             <i class="fa fa-fw fa-sitemap"></i>
-        <a class="hierarchyTreeLinkText" data-lightbox href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLink()->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
+              <a class="hierarchyTreeLinkText" data-lightbox href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLink()->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
               <?=$this->transEsc('hierarchy_view_context')?><? if (count($trees) > 1): ?>: <?=$this->escapeHtml($hierarchyTitle)?><? endif; ?>
-            </a>
+              </a>
           </div>
         <? endforeach; ?>
       <? endif; ?>

themes/finc/templates/RecordTab/description.phtml

@@ -6,7 +6,8 @@
     // Grab clean ISBN for convenience:
     $isbn = $this->driver->getCleanISBN();
 ?>
-<table class="table table-striped" summary="<?=$this->transEsc('Description')?>" width="100%">
+<table class="table table-striped">
+  <caption class="sr-only"><?=$this->transEsc('Description')?></caption>
   <? $summ = $this->driver->getSummary(); if (!empty($summ)): ?>
     <? $contentDisplayed = true; ?>
     <tr>

themes/finc/templates/RecordTab/holdingsils.phtml

@@ -3,12 +3,17 @@
     // Set up convenience variables:
     $account = $this->auth()->getManager();
     $user = $account->isLoggedIn();
-    $holdings = $this->driver->getRealTimeHoldings();
     $openUrl = $this->openUrl($this->driver, 'holdings');
     $openUrlActive = $openUrl->isActive();
     // Account for replace_other_urls setting
     $urls = $this->record($this->driver)->getLinkDetails($openUrlActive);
     $offlineMode = $this->ils()->getOfflineMode();
+    try {
+        $holdings = $this->driver->getRealTimeHoldings();
+    } catch (\VuFind\Exception\ILS $e) {
+        $holdings = [];
+        $offlineMode = 'ils-offline';
+    }
     // Set page title.
     $this->headTitle($this->translate('Holdings') . ': ' . $this->driver->getBreadcrumb());
 ?>
@@ -16,7 +21,7 @@
 <?=$this->context($this)->renderInContext('librarycards/selectcard.phtml', array('user' => $this->auth()->isLoggedIn())); ?>
 
 <? if ($offlineMode == "ils-offline"): ?>
-  <div data-alert class="alert-box warning" tabindex="0" aria-live="assertive" role="alertdialog">">
+  <div data-alert class="alert-box warning" tabindex="0" aria-live="assertive" role="alertdialog">
     <h2><?=$this->transEsc('ils_offline_title')?></h2>
     <p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
     <p><?=$this->transEsc('ils_offline_holdings_message')?></p>
@@ -27,11 +32,11 @@
 <? if (($this->ils()->getHoldsMode() == 'driver' && !empty($holdings)) || $this->ils()->getTitleHoldsMode() == 'driver'): ?>
   <? if ($account->loginEnabled() && $offlineMode != 'ils-offline'): ?>
     <? if (!$user): ?>
-      <div data-alert class="alert-box info" tabindex="0" aria-live="assertive" role="alertdialog">">
+      <div data-alert class="alert-box info" tabindex="0" aria-live="assertive" role="alertdialog">
         <a href="<?=$this->recordLink()->getTabUrl($this->driver, 'Holdings')?>?login=true&amp;catalogLogin=true" data-lightbox><?=$this->transEsc("Login")?></a> <?=$this->transEsc("hold_login")?>
       </div>
     <? elseif (!$user->cat_username): ?>
-      <div data-alert class="alert-box info" tabindex="0" aria-live="assertive" role="alertdialog">">
+      <div data-alert class="alert-box info" tabindex="0" aria-live="assertive" role="alertdialog">
         <?=$this->translate("hold_profile_html", array('%%url%%' => $this->recordLink()->getTabUrl($this->driver, 'Holdings') . '?catalogLogin=true'))?>
       </div>
     <? endif; ?>
@@ -98,22 +103,27 @@
         <? if (isset($row['use_unknown_message']) && $row['use_unknown_message']): ?>
           <span class="label secondary"><?=$this->transEsc("status_unknown_message")?></span>
         <? else: ?>
-          <? /* WE USE callnumber here, rev #6237 - 04.16. CK */ ?>
+          <? /* WE USE callnumbers here, rev #6237 - 04.16. CK */ ?>
           <? if (isset($row['callnumber'])): ?>
             <span class="callnumber"><?=$this->transEsc("Call Number")?>: <?=$row['callnumber']?></span>
           <? endif; ?>
           <? if (isset($row['storage']) && $row['storage'] != 'Unknown'): ?>
             <span class="storage"><?=$this->transEsc("Location")?>: <?=$row['storage']?></span>
           <? endif; ?>
+
           <? if ($row['availability']): ?>
             <? /* Begin Available Items (Holds) */ ?>
-            <? /* WE USE notes here, rev #6237 - 04.16. CK */ ?>
+            <? /* WE USE notes here, rev #6237 - 04.16. CK - item_notes below*/ ?>
             <? if (isset($row['notes'])): ?>
               <span class="notes"><?=$this->transEsc("Notes")?>:</span>
               <ul class="notes">
                 <? foreach ($row['notes'] as $note): ?>
                   <li><?=$note?></li>
                 <? endforeach; ?>
+
+                <? foreach ($row['item_notes'] as $item_note): ?>
+                  <li><?=$this->escapeHtml($item_note) ?></li>
+                <? endforeach; ?>
               </ul>
             <? endif; ?>
             <? if (!$block && isset($row['link']) && $row['link']): ?>

themes/finc/templates/footer.phtml

@@ -20,7 +20,7 @@
   <li>
     <p><strong><?=$this->transEsc('Need Help?')?></strong></p>
     <ul>
-      <li><a href="<?=$this->url('help-home')?>?topic=search" class="help-link" data-lightbox title="<?=$this->transEsc('Search Tips')?>"><?=$this->transEsc('Search Tips')?></a></li>
+      <li><a href="<?=$this->url('help-home')?>?topic=search" data-lightbox class="help-link"><?=$this->transEsc('Search Tips')?></a></li>
       <li><a href="#"><?=$this->transEsc('Ask a Librarian')?></a></li>
       <li><a href="#"><?=$this->transEsc('FAQs')?></a></li>
     </ul>

themes/finc/templates/header.phtml

@@ -33,17 +33,16 @@
         <? endif; ?>
         <? if (is_object($account) && $account->loginEnabled()): // hide login/logout if unavailable ?>
           <li class="logoutOptions<? if (!$account->isLoggedIn()): ?> hide<? endif ?>">
-            <a href="<?=$this->url('myresearch-home', array(), array('query' => array('redirect' => 0)))?>" title="<?=$this->transEsc("Your Account")?>"><i
-                class="fa fa-home"></i> <?=$this->transEsc("Your Account")?></a>
+            <a href="<?=$this->url('myresearch-home', array(), array('query' => array('redirect' => 0)))?>"><i class="fa fa-home"></i> <?=$this->transEsc("Your Account")?></a>
           </li>
           <li class="logoutLink logoutOptions<? if (!$account->isLoggedIn()): ?> hide<? endif ?>">
             <a href="<?=$this->url('myresearch-logout')?>" title="<?=$this->transEsc("Log Out")?>"><i class="fa fa-sign-out"></i> <?=$this->transEsc("Log Out")?></a>
           </li>
           <li id="loginOptions" class="<? if ($account->isLoggedIn()): ?> hide<? endif ?>">
             <? if ($account->getSessionInitiator($this->serverUrl($this->url('myresearch-home')))): ?>
-              <a href="<?=$this->url('myresearch-userlogin')?>" title="<?=$this->transEsc("Institutional Login")?>"><i class="fa fa-sign-in"></i> <?=$this->transEsc("Institutional Login")?></a>
+              <a href="<?=$this->url('myresearch-userlogin')?>"><i class="fa fa-sign-in"></i> <?=$this->transEsc("Institutional Login")?></a>
             <? else: ?>
-              <a href="<?=$this->url('myresearch-userlogin')?>" data-lightbox title="<?=$this->transEsc("Login")?>"><i class="fa fa-sign-in"></i> <?=$this->transEsc("Login")?></a>
+              <a href="<?=$this->url('myresearch-userlogin')?>" data-lightbox><i class="fa fa-sign-in"></i> <?=$this->transEsc("Login")?></a>
             <? endif; ?>
           </li>
         <? endif; ?>

themes/finc/templates/search/searchbox.phtml

@@ -18,17 +18,15 @@ $advSearch = $options->getAdvancedSearchAction();
     $lastSort = $this->searchMemory()->getLastSort($this->searchClassId);
     $lastLimit = $this->searchMemory()->getLastLimit($this->searchClassId);
     $ignoreHiddenFilterMemory = isset($this->ignoreHiddenFilterMemory) && $this->ignoreHiddenFilterMemory;
-    $hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId, $ignoreHiddenFilterMemory);
+    $ignoreHiddenFiltersInRequest = isset($this->ignoreHiddenFiltersInRequest) && $this->ignoreHiddenFiltersInRequest;
+    $hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId, $ignoreHiddenFilterMemory, $ignoreHiddenFiltersInRequest);
     if (empty($hiddenFilters) && !$ignoreHiddenFilterMemory) {
         $hiddenFilters = $this->searchMemory()->getLastHiddenFilters($this->searchClassId);
+        if (empty($hiddenFilters)) {
+            $hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId);
     }
-    $hiddenFilterParams = [];
-    foreach ($hiddenFilters as $key => $filter) {
-        foreach ($filter as $value) {
-            $hiddenFilterParams[] = urlencode('hiddenFilters[]') . '=' . urlencode("$key:$value");
         }
-    }
-    $hiddenFilterParams = empty($hiddenFilterParams) ? '' : '?' . implode('&', $hiddenFilterParams);
+    $hiddenFilterParams = $this->searchtabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?');
 ?>
 <? if ($this->searchType == 'advanced'): ?>
   <div class="searchForm">

themes/foundation5/js/record.js

@@ -240,7 +240,6 @@ function recordDocReady() {
     $top.find('.content.active').removeClass('active');
     $top.find('.tab-title').removeClass('active');
     $top.find('.'+tabid).parent().addClass('active');
-    $(this).tab('show');
     if ($top.find('.'+tabid+'-tab').length > 0) {
       $top.find('.'+tabid+'-tab').addClass('active');
       window.location.hash = tabid;