diff --git a/themes/fid_adlr/templates/RecordTab/acquisitionpda.phtml b/themes/fid_adlr/templates/RecordTab/acquisitionpda.phtml index 402670746fc59e7d5551e89339bc10d8cb5a8dce..59953f0c5d795595f5b732265736711b2585c1b8 100644 --- a/themes/fid_adlr/templates/RecordTab/acquisitionpda.phtml +++ b/themes/fid_adlr/templates/RecordTab/acquisitionpda.phtml @@ -30,8 +30,6 @@ if (!$offlineMode) { $offlineMode = 'ils-offline'; } } -// Set page title. -$this->headTitle($this->driver->getBreadcrumb()); $isRecordOrdered = $this->getit($this->driver)->isRecordOrdered(); ?> diff --git a/themes/fid_adlr/templates/RecordTab/description.phtml b/themes/fid_adlr/templates/RecordTab/description.phtml index 54df32f043f4aec2981154603bb6e4653e185fcd..fa76c68d88c8d7c93f9cb3657127a79e4efc9c10 100644 --- a/themes/fid_adlr/templates/RecordTab/description.phtml +++ b/themes/fid_adlr/templates/RecordTab/description.phtml @@ -1,8 +1,5 @@ <!-- fid_adlr: recordtab - description --> <?php -// Set page title. -$this->headTitle($this->driver->getBreadcrumb()); - $formatter = $this->recordDataFormatter(); $mainFields = $formatter->getData($this->driver, $formatter->getDefaults('description')); ?> diff --git a/themes/fid_adlr/templates/RecordTab/holdingsils.phtml b/themes/fid_adlr/templates/RecordTab/holdingsils.phtml index b7983c30fa62d4bce2ebb3ab2091150889c33a6d..fe522c6c6820db4ac3c920b6b082bc2941240de5 100644 --- a/themes/fid_adlr/templates/RecordTab/holdingsils.phtml +++ b/themes/fid_adlr/templates/RecordTab/holdingsils.phtml @@ -31,8 +31,6 @@ $offlineMode = 'ils-offline'; } } - // Set page title. - $this->headTitle($this->driver->getBreadcrumb()); ?> <?php if ($user && $getitConfig['bossData']): ?> diff --git a/themes/fid_adlr/templates/RecordTab/staffviewai.phtml b/themes/fid_adlr/templates/RecordTab/staffviewai.phtml index 709b245524f10ba6fa8729adac230ddd1b9cf3a8..b0f10f828cbb1e0c8d48785078cb351fa27c8ac3 100644 --- a/themes/fid_adlr/templates/RecordTab/staffviewai.phtml +++ b/themes/fid_adlr/templates/RecordTab/staffviewai.phtml @@ -1,7 +1,5 @@ <!-- fid_adlr: recordtab - staffviewai --> <?php -// Set page title. -$this->headTitle($this->driver->getBreadcrumb()); ?> <table class="citation table table-striped"> <?php foreach ($this->driver->getAIRecord() as $field => $values): ?> diff --git a/themes/fid_adlr/templates/RecordTab/staffviewmarc.phtml b/themes/fid_adlr/templates/RecordTab/staffviewmarc.phtml index 54af3f791ea09ed34dfc0da265a76bf979085ddb..8f001a9dce016eddfbd370a3d72657e6701fc575 100644 --- a/themes/fid_adlr/templates/RecordTab/staffviewmarc.phtml +++ b/themes/fid_adlr/templates/RecordTab/staffviewmarc.phtml @@ -1,7 +1,5 @@ <!-- fid_adlr: recordtab - staffviewmarc --> <?php -// Set page title. -$this->headTitle($this->driver->getBreadcrumb()); ?> <?=\VuFind\XSLT\Processor::process('record-marc.xsl', $this->driver->getXML('marc21'))?> <?php /* the following introduced in 9934*/ ?> diff --git a/themes/fid_adlr/templates/RecordTab/toc.phtml b/themes/fid_adlr/templates/RecordTab/toc.phtml index 0925ed435f374c8c5929f500aec66681f9d86338..5b4c5b7aa8163ad03fd7d1b022b6e7678debc926 100644 --- a/themes/fid_adlr/templates/RecordTab/toc.phtml +++ b/themes/fid_adlr/templates/RecordTab/toc.phtml @@ -1,8 +1,5 @@ <!-- fid_adlr: recordtab - toc --> <?php -// Set page title. -$this->headTitle($this->driver->getBreadcrumb()); - $formatter = $this->recordDataFormatter(); $mainFields = $formatter->getData($this->driver, $formatter->getDefaults('toc')); ?> diff --git a/themes/fid_adlr/templates/layout/layout.phtml b/themes/fid_adlr/templates/layout/layout.phtml index 4c23209b7830d64742ae8e038cbbe0545550ca2e..ea23889fc6c84f07ca5f54e11a7327d328982440 100644 --- a/themes/fid_adlr/templates/layout/layout.phtml +++ b/themes/fid_adlr/templates/layout/layout.phtml @@ -4,11 +4,6 @@ <?php $this->headThemeResources(); ?> <?php /* remove meta because of W3C Validator error - CK */ /* <meta charset="utf-8"> */ - - if (empty($this->headTitle()) || $this->headTitle()->toString() == "<title></title>") { - $this->headTitle($this->translate('adlr_head_title')); - } - ?> <meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta name="viewport" content="width=device-width,initial-scale=1.0"/> @@ -20,7 +15,7 @@ <? /* END TODO */ ?> <?=$this->headMeta()?> - <?=$this->headTitle()?> + <?=$this->headTitle(' ' . $this->translate('adlr_head_title'))?> <?php // Set up OpenSearch link: $this->headLink( diff --git a/themes/fid_adlr/templates/record/view.phtml b/themes/fid_adlr/templates/record/view.phtml index c669e697c84d65901b350a846e9d26b5d2981bb2..ab1f790e1e36777be4e6e75e1aa7e6c24670a47d 100644 --- a/themes/fid_adlr/templates/record/view.phtml +++ b/themes/fid_adlr/templates/record/view.phtml @@ -18,6 +18,7 @@ if ($this->export()->recordSupportsFormat($this->driver, 'RDF')) { $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ') . '<li class="active">' . $this->recordLink()->getBreadcrumb($this->driver) . '</li> '; $this->layout()->title = $this->driver->getShortTitle(); +$this->headTitle($this->driver->getBreadcrumb() . ' -'); ?> <?php /* fid_adlr:Remove previous and next record refs #15650 - GG */ ?> diff --git a/themes/fid_adlr/templates/search/results.phtml b/themes/fid_adlr/templates/search/results.phtml index 267ac43e0556989d65523d94097ab7484a56619e..c07ca9231122d3331b3823c393e915a4156c726e 100644 --- a/themes/fid_adlr/templates/search/results.phtml +++ b/themes/fid_adlr/templates/search/results.phtml @@ -1,9 +1,8 @@ <!-- fid_adlr: search - results --> <?php -// Set up page title: -$this->headTitle($this->translate('adlr_head_title')); $lookfor = $this->results->getUrlQuery()->isQuerySuppressed() ? '' : $this->params->getDisplayQuery(); +$this->headTitle($this->translate('Search Results') . (empty($lookfor) ? '' : " - {$lookfor} - ")); // Set up search box: $this->layout()->searchbox = $this->context($this)->renderInContext(