diff --git a/module/finc/src/finc/RecordDriver/SolrDico.php b/module/finc/src/finc/RecordDriver/SolrDico.php
index c18b6323c5f9d13acae3e22426ed6bc5b51dda0b..f534a67a14fc65bfef7d66058de4f478a8e9d589 100644
--- a/module/finc/src/finc/RecordDriver/SolrDico.php
+++ b/module/finc/src/finc/RecordDriver/SolrDico.php
@@ -124,7 +124,7 @@ class SolrDico extends SolrDefault
* Returns the object'S licence information from the full record
* @return array
*/
- public function getLicenceInfo()
+ public function getLicense()
{
$prefix = "object_rights_statement_";
$fields = [
diff --git a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
index c17bd5e99f6029bf368c46cdf01dccda9e2e53d8..c5ca36fcf7ea41d05ac033bde79e118a30388583 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
@@ -2476,16 +2476,20 @@ trait SolrMarcFincTrait
* @return array|null
*/
public function getLicense() {
- if ($field = $this->getMarcRecord()->getField('540')) {
+ $retval = null;
+ if ($licenses = $this->getMarcRecord()->getFields('540')) {
$retval = [];
- foreach (['name' => 'a', 'url' => 'u'] as $key => $sub_name) {
- if ($line = $field->getSubfield($sub_name)) {
- $retval[$key] = $line->getData();
+ $i = 0;
+ foreach ($licenses as $license) {
+ foreach (['code' => 'a', 'url' => 'u', 'text' => 'f'] as $key => $sub_name) {
+ if ($line = $license->getSubfield($sub_name)) {
+ $retval[$i][$key] = $line->getData();
+ }
}
+ $i++;
}
- return $retval;
}
- return null;
+ return $retval;
}
/**
diff --git a/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml b/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
index ed63456d5f7021511cfd29ab0f268c7175593362..379fd2fbdd2e9e13bd500a6dce199b62698a619d 100644
--- a/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
+++ b/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
@@ -2,7 +2,7 @@
<?php /* compare with BS login templates in Auth during updates */ ?>
<?php
// Set page title.
-$this->headTitle($this->translate('Reset Password'));
+$this->headTitle($this->translate('Reset Password') . ' | ' . $this->translate("LibraryName"));
?>
<h1><?=$this->transEsc('Reset Password')?></h1>
<form method="post" name="resetPasswordForm" action="<?=$this->url('myresearch-resetpassword')?>">
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/data-license.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/data-license.phtml
deleted file mode 100644
index d8230b72f63ddea10fbed660a4fd7003156f60a2..0000000000000000000000000000000000000000
--- a/themes/finc/templates/RecordDriver/DefaultRecord/data-license.phtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- finc: RecordDriver - DefaultRecord - data-license -->
-<?php if (!empty($data) && is_array($data)): ?>
- <?= $data['name'] ?> (<a href="<?= $data['url'] ?>"><?= $data['url'] ?></a>)
-<?php endif; ?>
-<!-- finc: RecordDriver - DefaultRecord - data-license - END -->
\ No newline at end of file
diff --git a/themes/finc/templates/RecordDriver/SolrDico/data-license.phtml b/themes/finc/templates/RecordDriver/SolrDico/data-license.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..5cef1f3ac0db8b0faed390010fe4c9c930e2d2de
--- /dev/null
+++ b/themes/finc/templates/RecordDriver/SolrDico/data-license.phtml
@@ -0,0 +1,17 @@
+<!-- finc: RecordDriver - SolrDico - data-license -->
+<!-- in contrast to SolrMarc data-license.phtml, $data is an one-dimensional array and has an optional icon -->
+<?php $label = $this->escapeHtml($data['code']) . " (" . $this->escapeHtml($data['text']) . ")"; ?>
+<?php ob_start() ?>
+<?=$label ?>
+<?php if (isset($data['icon'])): ?>
+ <img class="collection-data collection-licence-image" src="<?=$data['icon']?>"/>
+<?php endif; ?>
+<?php $label = ob_get_contents();
+ ob_end_clean();
+?>
+<?php if (isset($data['url'])): ?>
+ <?= $this->externalLink($data['url'], $label) ?>
+<?php else: ?>
+ <?= $label ?>
+<?php endif;?>
+<!-- finc: RecordDriver - SolrDico - data-license - END -->
\ No newline at end of file
diff --git a/themes/finc/templates/RecordDriver/SolrMarc/data-license.phtml b/themes/finc/templates/RecordDriver/SolrMarc/data-license.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..7407ecf961246ea38be15eece3b0f5bb2323dfd0
--- /dev/null
+++ b/themes/finc/templates/RecordDriver/SolrMarc/data-license.phtml
@@ -0,0 +1,14 @@
+<!-- finc: RecordDriver - SolrMarc - data-licence -->
+<?php if (is_array($data) && count($data)): ?>
+ <?php foreach ($data as $license) : ?>
+ <div>
+ <?php $text = ($license['code'] ?? '') . (isset($license['text']) ? " ({$license['text']})" : '') ?>
+ <?php if (isset($license['url'])): ?>
+ <?= $this->externalLink($license['url'], $text ?? $license['url']) ?>
+ <?php else: ?>
+ <?= $text ?>
+ <?php endif;?>
+ </div>
+ <?php endforeach; ?>
+<?php endif; ?>
+<!-- finc: RecordDriver - SolrMarc - data-licence - END -->
\ No newline at end of file
diff --git a/themes/finc/templates/RecordTab/acquisitionpda.phtml b/themes/finc/templates/RecordTab/acquisitionpda.phtml
index 91296ba15fa006a007013d4545a6cbfcb675aa6f..ed7a386cde1c1ae3812954f441cc60ef35cb81b2 100644
--- a/themes/finc/templates/RecordTab/acquisitionpda.phtml
+++ b/themes/finc/templates/RecordTab/acquisitionpda.phtml
@@ -4,6 +4,7 @@
$this->headTitle(
$this->translate('PDA::Acquisition') . ': ' .
$this->driver->getBreadcrumb()
+ . ' | ' . $this->translate("LibraryName")
);
// Get some variables
$id = $this->driver->getUniqueId();
diff --git a/themes/finc/templates/RecordTab/description.phtml b/themes/finc/templates/RecordTab/description.phtml
index 0e39ff89ba9bad658a112800f42272aa2d5adde1..9978227ede0bfccc83dc8c95544d3e674b78b736 100644
--- a/themes/finc/templates/RecordTab/description.phtml
+++ b/themes/finc/templates/RecordTab/description.phtml
@@ -1,7 +1,7 @@
<!-- finc: recordtab - description -->
<?php
// Set page title.
-$this->headTitle($this->translate('Description') . ': ' . $this->driver->getBreadcrumb());
+$this->headTitle($this->translate('Description') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
$formatter = $this->recordDataFormatter();
$mainFields = $formatter->getData($driver, $formatter->getDefaults('description'));
diff --git a/themes/finc/templates/RecordTab/descriptionlido.phtml b/themes/finc/templates/RecordTab/descriptionlido.phtml
index 939b171f95eefcc3f9f00317a898dafd25cf85b9..221d9845697b85d4f1958a4f7e8acaca99247eff 100644
--- a/themes/finc/templates/RecordTab/descriptionlido.phtml
+++ b/themes/finc/templates/RecordTab/descriptionlido.phtml
@@ -1,7 +1,7 @@
<!-- finc: recordtab - descriptionlido -->
<?php
// Set page title.
-$this->headTitle($this->translate('Description') . ': ' . $this->driver->getBreadcrumb());
+$this->headTitle($this->translate('Description') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
$formatter = $this->recordDataFormatter();
$mainFields = $formatter->getData($driver, $formatter->getDefaults('description-lido'));
diff --git a/themes/finc/templates/RecordTab/hierarchytree.phtml b/themes/finc/templates/RecordTab/hierarchytree.phtml
index 0c5f7f1879a63203bbb26f691421c32928f8dad5..dfc402d78303083e7f2f1c81097c7fee6c9dec90 100644
--- a/themes/finc/templates/RecordTab/hierarchytree.phtml
+++ b/themes/finc/templates/RecordTab/hierarchytree.phtml
@@ -1,7 +1,7 @@
<!-- finc: record-tab - hierarchytree -->
<?php
// Set page title.
- $this->headTitle($this->translate('hierarchy_tree') . ': ' . $this->driver->getBreadcrumb());
+ $this->headTitle($this->translate('hierarchy_tree') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
$hierarchyTreeList = $this->tab->getTreeList();
$activeTree = $this->tab->getActiveTree();
diff --git a/themes/finc/templates/RecordTab/holdingsils.phtml b/themes/finc/templates/RecordTab/holdingsils.phtml
index d929e6b59b9855a214f6df8fa0c0852f307a6d1e..b78c5f34b091958a8cc8ef0a7b03cfe56abd3173 100644
--- a/themes/finc/templates/RecordTab/holdingsils.phtml
+++ b/themes/finc/templates/RecordTab/holdingsils.phtml
@@ -26,7 +26,7 @@
}
}
// Set page title.
- $this->headTitle($this->translate('Holdings') . ': ' . $this->driver->getBreadcrumb());
+ $this->headTitle($this->translate('Holdings') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
?>
<?php /* finc-specific: nxt line - #7841@56988450 - CK */ ?>
diff --git a/themes/finc/templates/RecordTab/serviceebl.phtml b/themes/finc/templates/RecordTab/serviceebl.phtml
index edb3e1171bcbc3daeae2214b6fe827fb5b0105e2..5ef8e11a1e920bb79aafc7a5a75c536fecd8bd66 100644
--- a/themes/finc/templates/RecordTab/serviceebl.phtml
+++ b/themes/finc/templates/RecordTab/serviceebl.phtml
@@ -1,6 +1,6 @@
<?php
// Set page title.
-$this->headTitle($this->translate('EBL') . ': ' . $this->driver->getBreadcrumb());
+$this->headTitle($this->translate('EBL') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
// Get EBL url
$link = $this->tab->getLinkEBL();
diff --git a/themes/finc/templates/RecordTab/staffviewai.phtml b/themes/finc/templates/RecordTab/staffviewai.phtml
index d38b62fdc2e8e2c10139f41c3ef7feafe24b00ea..62a5748a6bf89b2aa11b6070c638923dd7f5ed85 100644
--- a/themes/finc/templates/RecordTab/staffviewai.phtml
+++ b/themes/finc/templates/RecordTab/staffviewai.phtml
@@ -1,7 +1,7 @@
<!-- finc: recordtab - staffviewai -->
<?php
// Set page title.
-$this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBreadcrumb());
+$this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
?>
<?php /* include responsive data table - CK */ ?>
<table class="citation table table-striped table-resp-data">
diff --git a/themes/finc/templates/RecordTab/staffviewarray.phtml b/themes/finc/templates/RecordTab/staffviewarray.phtml
index c046901cfae8ac587a7212b2c298778d27e6bf99..73fac7db40f4c14da918d763e6626f7e32bef0b8 100644
--- a/themes/finc/templates/RecordTab/staffviewarray.phtml
+++ b/themes/finc/templates/RecordTab/staffviewarray.phtml
@@ -1,7 +1,7 @@
<!-- finc: recordtab - staffviewarray -->
<?php
// Set page title.
- $this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBreadcrumb());
+ $this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
?>
<?php /* include responsive data table - CK */ ?>
<table class="citation table table-striped table-resp-data">
diff --git a/themes/finc/templates/RecordTab/staffviewmarc.phtml b/themes/finc/templates/RecordTab/staffviewmarc.phtml
index ebd800bbd7d5e6d2d6ed8fbd27770e893a99748a..19f2aa691b4c7e449cbb5031ff7b35fa277773a6 100644
--- a/themes/finc/templates/RecordTab/staffviewmarc.phtml
+++ b/themes/finc/templates/RecordTab/staffviewmarc.phtml
@@ -1,7 +1,7 @@
<!-- finc: recordtab - staffviewmarc -->
<?php
// Set page title.
-$this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBreadcrumb());
+$this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
?>
<?=\VuFind\XSLT\Processor::process('record-marc.xsl', $this->driver->getXML('marc21'))?>
<?php /* the following introduced in 9934*/ ?>
diff --git a/themes/finc/templates/RecordTab/topics.phtml b/themes/finc/templates/RecordTab/topics.phtml
index 40d1f149f839a6b4f7ab6fa43499d9ce7711dd26..eac80af00c6e507c3d5e595f6dea59ab42a37f47 100644
--- a/themes/finc/templates/RecordTab/topics.phtml
+++ b/themes/finc/templates/RecordTab/topics.phtml
@@ -1,7 +1,7 @@
<!-- finc: recordtab - topics -->
<?php
// Set page title.
-$this->headTitle($this->translate('Topics') . ': ' . $this->driver->getBreadcrumb());
+$this->headTitle($this->translate('Topics') . ': ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
?>
<table class="table table-striped table-resp-data">
diff --git a/themes/finc/templates/admin/home.phtml b/themes/finc/templates/admin/home.phtml
index 5e8aa62a4df836ff1d9e1273b9cc352803b0394d..57ba0f0328634cd6ce63370cb6a12c8c0308ebda 100644
--- a/themes/finc/templates/admin/home.phtml
+++ b/themes/finc/templates/admin/home.phtml
@@ -5,7 +5,7 @@
*/
// Set page title.
- $this->headTitle($this->translate('VuFind Administration - Home'));
+ $this->headTitle($this->translate('VuFind Administration - Home') . ' | ' . $this->translate("LibraryName"));
// Set up map of core name => label
$coreLabels = [
diff --git a/themes/finc/templates/alphabrowse/home.phtml b/themes/finc/templates/alphabrowse/home.phtml
index 0e024ed7736b62ce650b2ecb94301eaa95c34525..ccd0a1caca6663b2abf1e2b3c28650f5361659b3 100644
--- a/themes/finc/templates/alphabrowse/home.phtml
+++ b/themes/finc/templates/alphabrowse/home.phtml
@@ -1,6 +1,6 @@
<!-- finc - templates - alphabrowse - home -->
<?php
- $this->headTitle($this->translate('Browse the Collection Alphabetically'));
+ $this->headTitle($this->translate('Browse the Collection Alphabetically') . ' | ' . $this->translate("LibraryName"));
$this->layout()->breadcrumbs = '<a href="' . $this->url('alphabrowse-home') . '">' . $this->transEsc('Browse Alphabetically') . '</a>';
$baseQuery = ['source' => $this->source, 'from' => $this->from];
diff --git a/themes/finc/templates/amsl/sources-list.phtml b/themes/finc/templates/amsl/sources-list.phtml
index 371f906684de2b40f1af54bc0857935c9662358e..5946ef486e2eb1b9155d158144cf9845ed0c7bb8 100644
--- a/themes/finc/templates/amsl/sources-list.phtml
+++ b/themes/finc/templates/amsl/sources-list.phtml
@@ -8,7 +8,7 @@
<!-- finc: amsl/sources-list - home -->
<?php
// Set up page title:
-$this->headTitle($this->translate('List of available Sources'));
+$this->headTitle($this->translate('List of available Sources') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs .= '</li> <li class="active">' . $this->transEsc('List of available Sources') . '</li>';
diff --git a/themes/finc/templates/browse/home.phtml b/themes/finc/templates/browse/home.phtml
index d20402286c31d1e1cb1a62bc133202e76d32be3a..bac20ae20af94ca87b00416f6e717201e4807567 100644
--- a/themes/finc/templates/browse/home.phtml
+++ b/themes/finc/templates/browse/home.phtml
@@ -2,7 +2,7 @@
<?php /* copied from bootstrap3 - added h1 for sr-only - #17596 - HR */?>
<?php
- $this->headTitle($this->translate('Browse the Catalog'));
+ $this->headTitle($this->translate('Browse the Catalog') . ' | ' . $this->translate("LibraryName"));
$this->layout()->breadcrumbs = '<a href="' . $this->url('browse-home') . '">' . $this->transEsc('Browse') . '</a>';
$BROWSE_BASE = $this->url('browse-' . strtolower($this->currentAction));
diff --git a/themes/finc/templates/cart/cart.phtml b/themes/finc/templates/cart/cart.phtml
index 7ac208d9e771e3d811ae9d85a734363d7bf9ab7f..53de8590ca3166083e4306543a0e650e8f76747d 100644
--- a/themes/finc/templates/cart/cart.phtml
+++ b/themes/finc/templates/cart/cart.phtml
@@ -1,7 +1,7 @@
<!-- finc: cart - cart -->
<?php
// Set page title.
- $this->headTitle($this->translate('Book Bag'));
+ $this->headTitle($this->translate('Book Bag') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ')
diff --git a/themes/finc/templates/cart/email.phtml b/themes/finc/templates/cart/email.phtml
index 54d82cec86f881f049b263075dbd504ce3b1bec2..e4498df745d3b85842e6f3c979f61e920a4985c1 100644
--- a/themes/finc/templates/cart/email.phtml
+++ b/themes/finc/templates/cart/email.phtml
@@ -3,7 +3,7 @@
<?php
// Set page title.
- $this->headTitle($this->translate('email_selected_favorites'));
+ $this->headTitle($this->translate('email_selected_favorites') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ')
diff --git a/themes/finc/templates/cart/save.phtml b/themes/finc/templates/cart/save.phtml
index 92183fe7ae68d337ba0517f85ad01e5049ff4638..dd40f5249f412408ae436a86365ffb3833155def 100644
--- a/themes/finc/templates/cart/save.phtml
+++ b/themes/finc/templates/cart/save.phtml
@@ -3,7 +3,7 @@
<?php
// Set page title.
- $this->headTitle($this->translate('bookbag_save_selected'));
+ $this->headTitle($this->translate('bookbag_save_selected') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ') .
diff --git a/themes/finc/templates/channels/home.phtml b/themes/finc/templates/channels/home.phtml
index 5bf072cc53b5b52ba409d30d005d485f67a0ac57..5220503f93636b5e0b7bb097ad31ca3fe70d1923 100644
--- a/themes/finc/templates/channels/home.phtml
+++ b/themes/finc/templates/channels/home.phtml
@@ -3,7 +3,7 @@
<?php
// Set up page title:
- $this->headTitle($this->translate('Channels'));
+ $this->headTitle($this->translate('Channels') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li class="active">' . $this->transEsc('Channels') . '</li>';
diff --git a/themes/finc/templates/documentdeliveryservice/home.phtml b/themes/finc/templates/documentdeliveryservice/home.phtml
index bf92244c324628580b2de650cfcbc63263264e5a..7b19271a9f9f214eeaeef98e26773e261fb945ed 100644
--- a/themes/finc/templates/documentdeliveryservice/home.phtml
+++ b/themes/finc/templates/documentdeliveryservice/home.phtml
@@ -1,6 +1,6 @@
<?php
// Set up page title:
-$this->headTitle($this->translate('Delivery service for documents'));
+$this->headTitle($this->translate('Delivery service for documents') . ' | ' . $this->translate("LibraryName"));
?>
<?=($this->loadForm ? $this->render('documentdeliveryservice/form.phtml') : $this->flashmessages());?>
\ No newline at end of file
diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml
index 7a37482bbcc7ac0c29756766a026eb3335cba979..50d239b701eb65722cd1115f6bdc0c405fae1650 100644
--- a/themes/finc/templates/header.phtml
+++ b/themes/finc/templates/header.phtml
@@ -38,7 +38,7 @@
if ($cart->isActive()): ?>
<li id="cartSummary">
<a id="cartItems" class="btn" data-lightbox title="<?=$this->transEsc('View Book Bag')?>" href="<?=$this->url('cart-home')?>">
- <i class="fa fa-clipboard" aria-hidden="true"></i> <strong><?=count($cart->getItems())?></strong> <span class="cart-label"><?=$this->transEsc('items')?></span>
+ <i class="fa fa-clipboard" aria-hidden="true"></i> <span role="status"><span class="sr-only"><?=$this->transEsc('Book Bag')?>:</span> <strong><?=count($cart->getItems())?></strong> <span class="cart-label"><?=$this->transEsc('items')?></span></span>
<span class="sr-only full<?=!$cart->isFull() ? ' hidden' : ''?>">(<?=$this->transEsc('bookbag_full')?>)</span>
</a>
</li>
diff --git a/themes/finc/templates/librarycards/editcard.phtml b/themes/finc/templates/librarycards/editcard.phtml
index 9a7926db76b7240eaabdc86e678bccbaf0ab8cb3..34c7edc473a76f2e50c49eca4f540d84d4fc42e0 100644
--- a/themes/finc/templates/librarycards/editcard.phtml
+++ b/themes/finc/templates/librarycards/editcard.phtml
@@ -2,7 +2,7 @@
<?php
// Set up page title:
$pageTitle = empty($this->card->id) ? 'Add a Library Card' : "Edit Library Card";
- $this->headTitle($this->translate($pageTitle));
+ $this->headTitle($this->translate($pageTitle) . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>'
diff --git a/themes/finc/templates/librarycards/home.phtml b/themes/finc/templates/librarycards/home.phtml
index 25338aa28e5edea51bc2a71d4f43f48a6918bd21..5ded3c3ad5ab34855ee8dc96658d5d455be730cd 100644
--- a/themes/finc/templates/librarycards/home.phtml
+++ b/themes/finc/templates/librarycards/home.phtml
@@ -1,7 +1,7 @@
<!-- finc: librarycards - home -->
<?php
// Set up page title:
- $this->headTitle($this->translate('Library Cards'));
+ $this->headTitle($this->translate('Library Cards') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Library Cards') . '</li>';
diff --git a/themes/finc/templates/myresearch/account.phtml b/themes/finc/templates/myresearch/account.phtml
index b1055a8c55baea6e4f76428bbad1ef93d11cedae..93352dd3908d86ca3485ed1c6c20d99ea20bcb2b 100644
--- a/themes/finc/templates/myresearch/account.phtml
+++ b/themes/finc/templates/myresearch/account.phtml
@@ -2,7 +2,7 @@
<?php
// Set up page title:
- $this->headTitle($this->translate('User Account'));
+ $this->headTitle($this->translate('User Account') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Account') . '</li>';
diff --git a/themes/finc/templates/myresearch/acquisition.phtml b/themes/finc/templates/myresearch/acquisition.phtml
index 62d81badc6f0194afb2e0de9effce3391e3e3ab6..0d2140246d9337b1bc9ef9ea63855496878d6bfd 100644
--- a/themes/finc/templates/myresearch/acquisition.phtml
+++ b/themes/finc/templates/myresearch/acquisition.phtml
@@ -1,7 +1,7 @@
<!-- finc: myresearch - acquisition -->
<?php
// Set up page title:
-$this->headTitle($this->translate('PDA::pda_form_title'));
+$this->headTitle($this->translate('PDA::pda_form_title') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('PDA::pda_form_title') . '</li>';
diff --git a/themes/finc/templates/myresearch/cataloglogin.phtml b/themes/finc/templates/myresearch/cataloglogin.phtml
index f5d936fb60ea2aa92d23096d32afc4f94b0d1059..65a755ab2d32f494b16a448504f5d443c16c5c67 100644
--- a/themes/finc/templates/myresearch/cataloglogin.phtml
+++ b/themes/finc/templates/myresearch/cataloglogin.phtml
@@ -1,6 +1,6 @@
<?php
// Set up page title:
- $this->headTitle($this->translate('Login'));
+ $this->headTitle($this->translate('Login') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Login') . '</li>';
diff --git a/themes/finc/templates/myresearch/checkedout.phtml b/themes/finc/templates/myresearch/checkedout.phtml
index a6b6773c1a96c29bef8e5892db1ffae744b4d08a..da91dd35e27a562a426a54b8bf6fd13452ec3339 100644
--- a/themes/finc/templates/myresearch/checkedout.phtml
+++ b/themes/finc/templates/myresearch/checkedout.phtml
@@ -1,7 +1,7 @@
<!-- finc: myresearch - checkedout -->
<?php
// Set up page title:
- $this->headTitle($this->translate('Checked Out Items'));
+ $this->headTitle($this->translate('Checked Out Items') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Checked Out Items') . '</li>';
diff --git a/themes/finc/templates/myresearch/edit.phtml b/themes/finc/templates/myresearch/edit.phtml
index 0484ff434fbfb08d8b1806970c946cb7d0545bd3..71a923eaa555fe996483ffe554ab969699d7d453 100644
--- a/themes/finc/templates/myresearch/edit.phtml
+++ b/themes/finc/templates/myresearch/edit.phtml
@@ -3,7 +3,7 @@
<?php
// Set up page title:
- $this->headTitle($this->translate('Edit') . ' : ' . $this->driver->getBreadcrumb());
+ $this->headTitle($this->translate('Edit') . ' : ' . $this->driver->getBreadcrumb() . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Edit') . '</li>';
diff --git a/themes/finc/templates/myresearch/editlist.phtml b/themes/finc/templates/myresearch/editlist.phtml
index 929bb53ca801ed12daec205700970390de96cb04..91994836d6b1db9cf7916e333b35a6874dc2fccb 100644
--- a/themes/finc/templates/myresearch/editlist.phtml
+++ b/themes/finc/templates/myresearch/editlist.phtml
@@ -4,7 +4,7 @@
<?php
// Set up page title:
$pageTitle = empty($this->list->id) ? 'Create a List' : "edit_list";
- $this->headTitle($this->translate($pageTitle));
+ $this->headTitle($this->translate($pageTitle) . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>'
diff --git a/themes/finc/templates/myresearch/fines.phtml b/themes/finc/templates/myresearch/fines.phtml
index a4054ab251ff02135bbac77bc1fddac309500dbb..2762ecb0504a0a1fad0987a38f3528daac1f03de 100644
--- a/themes/finc/templates/myresearch/fines.phtml
+++ b/themes/finc/templates/myresearch/fines.phtml
@@ -1,7 +1,7 @@
<!-- finc: myresearch - fines -->
<?php
// Set up page title:
- $this->headTitle($this->translate('My Fines'));
+ $this->headTitle($this->translate('My Fines') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Fines') . '</li>';
diff --git a/themes/finc/templates/myresearch/historicloans.phtml b/themes/finc/templates/myresearch/historicloans.phtml
index 44605abc8de8fafa023af8ba0b70903984ef3263..16cf3c34b27a7a3cdadf23034fd3d30ced416536 100644
--- a/themes/finc/templates/myresearch/historicloans.phtml
+++ b/themes/finc/templates/myresearch/historicloans.phtml
@@ -1,7 +1,7 @@
<!-- finc: myresearch - historicloans -->
<?php
// Set up page title:
- $this->headTitle($this->translate('Loan History'));
+ $this->headTitle($this->translate('Loan History') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Loan History') . '</li>';
diff --git a/themes/finc/templates/myresearch/holds.phtml b/themes/finc/templates/myresearch/holds.phtml
index 6b584c7355cd127ed8e15dc3c689e737e098636d..7131cf6092de4f611c1d37361391d1bf7d624ee6 100644
--- a/themes/finc/templates/myresearch/holds.phtml
+++ b/themes/finc/templates/myresearch/holds.phtml
@@ -1,7 +1,7 @@
<!-- finc: myresearch - holds -->
<?php
// Set up page title:
- $this->headTitle($this->translate('My Holds'));
+ $this->headTitle($this->translate('My Holds') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('My Holds') . '</li>';
diff --git a/themes/finc/templates/myresearch/illrequests.phtml b/themes/finc/templates/myresearch/illrequests.phtml
index 6f87f860b07bdb742a7a115a18a82eabeb1a8a79..27320ac4a5b5bfea69fdd1a80ce8ed1f5bbba97d 100644
--- a/themes/finc/templates/myresearch/illrequests.phtml
+++ b/themes/finc/templates/myresearch/illrequests.phtml
@@ -1,7 +1,7 @@
<!-- finc: myresearch - illrequests -->
<?php
// Set up page title:
- $this->headTitle($this->translate('Interlibrary Loan Requests'));
+ $this->headTitle($this->translate('Interlibrary Loan Requests') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>'
diff --git a/themes/finc/templates/myresearch/mylist.phtml b/themes/finc/templates/myresearch/mylist.phtml
index 6354ae6aa1c7962981d456fc50ba0388082b6014..f210befcf16ca777958f1b0fc3c1fdfba48dbb41 100644
--- a/themes/finc/templates/myresearch/mylist.phtml
+++ b/themes/finc/templates/myresearch/mylist.phtml
@@ -4,7 +4,7 @@
$list = $this->results->getListObject();
// Set up page title:
-$this->headTitle(isset($list) ? $list->title : $this->translate('Favorites'));
+$this->headTitle(isset($list) ? $list->title : $this->translate('Favorites') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$currPage = isset($list) ? 'List' : 'Favorites';
diff --git a/themes/finc/templates/myresearch/newpassword.phtml b/themes/finc/templates/myresearch/newpassword.phtml
index b2102e7315a77aac2af970fed31039ebc427488a..713a5234ad4e995b5c03bce04913431e447a46bd 100644
--- a/themes/finc/templates/myresearch/newpassword.phtml
+++ b/themes/finc/templates/myresearch/newpassword.phtml
@@ -1,7 +1,7 @@
<!-- finc - templates - myresearch - newpassword -->
<?php
// Set up page title:
- $this->headTitle($this->translate('Create New Password'));
+ $this->headTitle($this->translate('Create New Password') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>'
diff --git a/themes/finc/templates/myresearch/profile.phtml b/themes/finc/templates/myresearch/profile.phtml
index 8360cd61d7bb948c9826c2a4ef1c035eaa4718fe..e3ad22b6eee0b6e85635afc077f9a5b98002452a 100644
--- a/themes/finc/templates/myresearch/profile.phtml
+++ b/themes/finc/templates/myresearch/profile.phtml
@@ -1,7 +1,7 @@
<!-- finc: myresearch - profile -->
<?php
// Set up page title:
- $this->headTitle($this->translate('My Profile'));
+ $this->headTitle($this->translate('My Profile') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Profile') . '</li>';
diff --git a/themes/finc/templates/myresearch/storageretrievalrequests.phtml b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
index a7ec9c253467e5a0395fceac4257cbfb79c20a62..7b34bcd48b0cd96bc58d09608690c419f73e3a9e 100644
--- a/themes/finc/templates/myresearch/storageretrievalrequests.phtml
+++ b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
@@ -1,7 +1,7 @@
<!-- finc: myresearch - storageretrievalrequests -->
<?php
// Set up page title:
- $this->headTitle($this->translate('Storage Retrieval Requests'));
+ $this->headTitle($this->translate('Storage Retrieval Requests') . ' | ' . $this->translate("LibraryName"));
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Storage Retrieval Requests') . '</li>';
diff --git a/themes/finc/templates/search/advanced/layout.phtml b/themes/finc/templates/search/advanced/layout.phtml
index 73abd574cfc985ee40bfa185163f42a77fb0807a..05624b555ebda60dc6b7a34a6ffc7af25a5d524c 100644
--- a/themes/finc/templates/search/advanced/layout.phtml
+++ b/themes/finc/templates/search/advanced/layout.phtml
@@ -1,7 +1,7 @@
<!-- finc: search - advanced - layout -->
<?php
// Set page title.
-$this->headTitle($this->translate('Advanced Search'));
+$this->headTitle($this->translate('Advanced Search') . ' | ' . $this->translate("LibraryName"));
// Disable top search box -- this page has a special layout.
$this->layout()->searchbox = false;
diff --git a/themes/finc/templates/search/history.phtml b/themes/finc/templates/search/history.phtml
index 04a7ee298e0aba39bd1d24479b4888e5c268933f..e5a71ac83b056b1722c83e26f6dfd9ce54a87310 100644
--- a/themes/finc/templates/search/history.phtml
+++ b/themes/finc/templates/search/history.phtml
@@ -1,7 +1,7 @@
<!-- finc - templates - search - history -->
<?php
// Set page title.
- $this->headTitle($this->translate('Search History'));
+ $this->headTitle($this->translate('Search History') . ' | ' . $this->translate("LibraryName"));
$loginEnabled = is_object($account = $this->auth()->getManager()) && $account->loginEnabled();
diff --git a/themes/finc/templates/search/home.phtml b/themes/finc/templates/search/home.phtml
index 4fc8d20045f806bc73c723704385410dd97f7cd5..781d4415bfc0377c3800d58c1f039a9aabecc575 100644
--- a/themes/finc/templates/search/home.phtml
+++ b/themes/finc/templates/search/home.phtml
@@ -1,7 +1,7 @@
<!-- finc: search - home -->
<?php
// Set page title.
- $this->headTitle($this->translate('Search Home'));
+ $this->headTitle($this->translate('Search Home') . ' | ' . $this->translate("LibraryName"));
// finc: disable top search box here if you want the old look, see also below
// $this->layout()->searchbox = false;
diff --git a/themes/finc/templates/search/results.phtml b/themes/finc/templates/search/results.phtml
index de9ade6fd08919a365af15829592376107b95f24..57048aa134330644849f05c4053b886b44022015 100644
--- a/themes/finc/templates/search/results.phtml
+++ b/themes/finc/templates/search/results.phtml
@@ -7,7 +7,7 @@ $lookfor = $this->results->getUrlQuery()->isQuerySuppressed() ? '' : $this->para
if (isset($this->overrideTitle)) {
$this->headTitle($this->overrideTitle);
} else {
- $this->headTitle($this->translate('Search Results') . (empty($lookfor) ? '' : " - {$lookfor}"));
+ $this->headTitle($this->translate('Search Results') . (empty($lookfor) ? '' : " - {$lookfor}") . ' | ' . $this->translate("LibraryName"));
}
// Set up search box: