diff --git a/docker-env.0.finc.yml b/docker-env.0.finc.yml
index f252aa0761d9b9a1381bf8f0a9df283d465f3c63..e7044cb07597e0791738680b4753f480be110d26 100644
--- a/docker-env.0.finc.yml
+++ b/docker-env.0.finc.yml
@@ -51,8 +51,6 @@ autoconfig:
Mail:
host: mail
port: 25
- username: dev
- password: dev
searches.ini:
IndexShards:
ai: ai.ub.uni-leipzig.de/solr/biblio
diff --git a/fid/languages/de.ini b/fid/languages/de.ini
index 21fbb5414d45edfc1a1555705e94fa39e2a463b6..62eabfa30dfaa91f1606d17af999bb4416bc9789 100644
--- a/fid/languages/de.ini
+++ b/fid/languages/de.ini
@@ -1,2 +1,42 @@
-@parent_ini = ../../languages/de.ini
-Logout = Abmelden
\ No newline at end of file
+;####################################################################
+;##################### DO NOT DELETE THIS HEADER ####################
+;################### Leipzig University Library © 2022 ##############
+;
+; This is a ISIL-instance-specific default LANGUAGE-file and inherits
+; all the settings from the LANGUAGE-file defined in @parent_ini which
+; points to the default LANGUAGE-file located in the folder
+; vufind2/local/languages
+;
+
+@parent_ini = "../../../local/languages/de.ini"
+
+;
+; Add instance-specific customization after this header.
+;
+;##################### DO NOT DELETE THIS HEADER ####################
+;####################################################################
+
+Logout = Abmelden
+
+Username = E-Mail-Adresse
+
+back_to_form = "weiter ausfüllen"
+
+#17495
+Price = "Preis"
+
+; DBIS / Licenses
+dbis_hint = "Hinweis"
+dbis_licenses_name = "Lizensierte Datenbanken"
+dbis_licenses_name_long = "Zugang zu freien und lizenzierten Fachdatenbanken"
+dbis_name = "Fachdatenbanken"
+dbis_text = "Diese Übersicht zeigt Ihnen alle frei verfügbaren Datenbanken aus DBIS zum Fachgebiet der Kommunikations- und Medienwissenschaft an. Wenn Sie mit Ihrem Nutzerkonto eingeloggt sind, werden Ihnen zusätzlich die bei Ihrer Heimatbibliothek lizenzierten Datenbanken angezeigt. Diese sind i. d. R. nur über Ihr jeweiliges Universitätsnetz bzw. per VPN-Zugang abrufbar."
+
+licenses = "Datenbanken"
+licenses_desc_1 = "Momentan haben Sie Zugriff auf:"
+licenses_forbidden_login_required = "Diese Lizenzen sind nur für angemeldete Nutzer in bestimmten Nutzergruppen verfügbar."
+licenses_forbidden_permission_denied = "Diese Lizenzen sind für Ihre Nutzergruppe leider nicht verfügbar."
+licenses_not_available = "Diese Lizenzen sind derzeit leider nicht verfügbar."
+licenses_notice_html = "Bitte nutzen Sie die Zeitungsarchive nur für Recherchen in üblichen Maßen. Die eingeräumten Lizenzen sind nicht für einen massenhaften Abruf von Zeitungsseiten ausgelegt (auch nicht für Textmining). Ein Abruf über das übliche Maß hinaus führt zu einem frühen Erschöpfen der lizenzierten Kontingente und geht zu Lasten Ihrer Kolleginnen und Kollegen.<br /><br />Bitte kontaktieren Sie uns immer vorab per E-Mail oder über unser <a data-lightbox href="%%contact_url%%">Kontaktformular</a>, wenn Sie für ein Forschungsprojekt eine größere Anzahl an Dokumenten abrufen bzw. Textmining nutzen möchten. Wir setzen uns dann mit Ihnen in Verbindung. <br /><br />Bitte beachten Sie auch unsere <a data-lightbox="" href="%%terms_url%%">Nutzungsbedingungen</a><br /><br />Herzlichen Dank für Ihr Verständnis!"
+licenses_search = "Datenbanken"
+licenses_text = "Hier haben Sie Zugang zu Datenbanken, die speziell durch uns für Sie lizenziert wurden. Die Kosten übernehmen wir für Sie."
diff --git a/fid/languages/en.ini b/fid/languages/en.ini
index 0970dd6215f1ca3a10747d68d581bf722d32418e..5f6aa09f11c61e1c792d5414b73dd46bde35565a 100644
--- a/fid/languages/en.ini
+++ b/fid/languages/en.ini
@@ -1 +1,38 @@
-@parent_ini = ../../languages/en.ini
\ No newline at end of file
+;####################################################################
+;##################### DO NOT DELETE THIS HEADER ####################
+;################### Leipzig University Library © 2022 ##############
+;
+; This is a ISIL-instance-specific default LANGUAGE-file and inherits
+; all the settings from the LANGUAGE-file defined in @parent_ini which
+; points to the default LANGUAGE-file located in the folder
+; vufind2/local/languages
+;
+
+@parent_ini = "../../../local/languages/en.ini"
+
+;
+; Add instance-specific customization after this header.
+;
+;##################### DO NOT DELETE THIS HEADER ####################
+;####################################################################
+
+Username = Email address
+
+back_to_form = "back to previous form"
+
+; DBIS / Licenses
+dbis_hint = "Notice"
+dbis_licenses_name = "Licensed Databases"
+dbis_licenses_name_long = "Access to free and licensed databases"
+dbis_name = "subject-specific Databases"
+dbis_text = "The subject-specific databases shown below and provided by DBIS are free to access. If you are logged in with your user account, additional databases which are specifically licensed by your home library are also listed. As a rule, these can only be accessed via your respective university network or VPN access."
+
+licenses = "Databases"
+licenses_desc_1 = "Currently, you have access to:"
+licenses_desc_2 = "Further license offers are in preparation. You may also write us your suggestions, which offers should also be licensed. Please use our <a href="../Contact/ContactForm">contact form</a>.<br /><br /><br />Our <a href="../AdlrRegistration/Terms">terms of use</a> apply."
+licenses_forbidden_login_required = "These licenses are only available for registered users in certain user groups."
+licenses_forbidden_permission_denied = "Licensed resources are not available for your user group."
+licenses_not_available = "Licensed resources temporarily not available."
+licenses_notice_html = "Please use the newspaper archives for normal searches only. The licences granted are not designed for mass retrieval of newspaper pages (e.g. for text mining). Downloads beyond the usual level will lead to premature expiry of the licensed quotas and is at the expense of your colleagues.<br /><br />Please always contact us in advance by e-mail or via our <a data-lightbox href="%%contact_url%%">contact form</a> if you would like to retrieve a larger number of documents for a research project or use text mining. We will then get in touch with you. <br /><br />Please also note our <a data-lightbox href="%%terms_url%%">Terms of Use</a>.<br /><br />Thank you for your understanding."
+licenses_search = "Databases"
+licenses_text = "Here you have access to databases that have been specially licensed for you. We cover the costs for you."
diff --git a/themes/fid/languages/fid/de.ini b/fid/languages/fid/de.ini
similarity index 100%
rename from themes/fid/languages/fid/de.ini
rename to fid/languages/fid/de.ini
diff --git a/themes/fid/languages/fid/en.ini b/fid/languages/fid/en.ini
similarity index 100%
rename from themes/fid/languages/fid/en.ini
rename to fid/languages/fid/en.ini
diff --git a/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php b/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php
index 4b8ae4866d25c59f90f315af5305f28e94578535..d31e09f4842199442225196a375a4819f98d1d44 100644
--- a/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php
@@ -91,6 +91,14 @@ class RecordDataFormatterFactory
'core-marc',
[$this, 'getMarcCoreSpecs']
);
+ $helper->setDefaults(
+ 'rvk',
+ [$this, 'getRvkSpecs']
+ );
+ $helper->setDefaults(
+ 'topics',
+ [$this, 'getTopicsSpecs']
+ );
return $helper;
}
@@ -913,4 +921,37 @@ class RecordDataFormatterFactory
);
return $spec->getArray();
}
+
+ /**
+ * Get marc specifications for displaying rvk.
+ *
+ * @return array
+ */
+ public function getRvkSpecs()
+ {
+ $spec = new RecordDataFormatter\SpecBuilder();
+ $spec->setTemplateLine(
+ 'Topics',
+ 'getRvkWithMetadata',
+ 'data-rvk.phtml'
+ );
+ return $spec->getArray();
+ }
+
+ /**
+ * Get marc specifications for displaying topics.
+ *
+ * @return array
+ */
+ public function getTopicsSpecs()
+ {
+ $spec = new RecordDataFormatter\SpecBuilder();
+ $spec->setTemplateLine(
+ 'Topics',
+ 'getTopics',
+ 'data-topics.phtml'
+ );
+ return $spec->getArray();
+ }
+
}
diff --git a/themes/fid/languages/de.ini b/themes/fid/languages/de.ini
deleted file mode 100644
index e7a23e50a42a8ba2b1a36cffed697b8180b2be00..0000000000000000000000000000000000000000
--- a/themes/fid/languages/de.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-Username = E-Mail-Adresse
-
-back_to_form = "weiter ausfüllen"
-
-#17495
-Price = "Preis"
-
-; DBIS / Licenses
-dbis_hint = "Hinweis"
-dbis_licenses_name = "Lizensierte Datenbanken"
-dbis_licenses_name_long = "Zugang zu freien und lizenzierten Fachdatenbanken"
-dbis_name = "Fachdatenbanken"
-dbis_text = "Diese Übersicht zeigt Ihnen alle frei verfügbaren Datenbanken aus DBIS zum Fachgebiet der Kommunikations- und Medienwissenschaft an. Wenn Sie mit Ihrem Nutzerkonto eingeloggt sind, werden Ihnen zusätzlich die bei Ihrer Heimatbibliothek lizenzierten Datenbanken angezeigt. Diese sind i. d. R. nur über Ihr jeweiliges Universitätsnetz bzw. per VPN-Zugang abrufbar."
-
-licenses = "Datenbanken"
-licenses_desc_1 = "Momentan haben Sie Zugriff auf:"
-licenses_forbidden_login_required = "Diese Lizenzen sind nur für angemeldete Nutzer in bestimmten Nutzergruppen verfügbar."
-licenses_forbidden_permission_denied = "Diese Lizenzen sind für Ihre Nutzergruppe leider nicht verfügbar."
-licenses_not_available = "Diese Lizenzen sind derzeit leider nicht verfügbar."
-licenses_notice_html = "Bitte nutzen Sie die Zeitungsarchive nur für Recherchen in üblichen Maßen. Die eingeräumten Lizenzen sind nicht für einen massenhaften Abruf von Zeitungsseiten ausgelegt (auch nicht für Textmining). Ein Abruf über das übliche Maß hinaus führt zu einem frühen Erschöpfen der lizenzierten Kontingente und geht zu Lasten Ihrer Kolleginnen und Kollegen.<br /><br />Bitte kontaktieren Sie uns immer vorab per E-Mail oder über unser <a data-lightbox href="%%contact_url%%">Kontaktformular</a>, wenn Sie für ein Forschungsprojekt eine größere Anzahl an Dokumenten abrufen bzw. Textmining nutzen möchten. Wir setzen uns dann mit Ihnen in Verbindung. <br /><br />Bitte beachten Sie auch unsere <a data-lightbox="" href="%%terms_url%%">Nutzungsbedingungen</a><br /><br />Herzlichen Dank für Ihr Verständnis!"
-licenses_search = "Datenbanken"
-licenses_text = "Hier haben Sie Zugang zu Datenbanken, die speziell durch uns für Sie lizenziert wurden. Die Kosten übernehmen wir für Sie."
diff --git a/themes/fid/languages/en.ini b/themes/fid/languages/en.ini
deleted file mode 100644
index 2b5ed42d0e186a11c606477478cdd6239aa9c515..0000000000000000000000000000000000000000
--- a/themes/fid/languages/en.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-@parent_ini = ../../languages/en.ini
-Username = Email address
-
-back_to_form = "back to previous form"
-
-; DBIS / Licenses
-dbis_hint = "Notice"
-dbis_licenses_name = "Licensed Databases"
-dbis_licenses_name_long = "Access to free and licensed databases"
-dbis_name = "subject-specific Databases"
-dbis_text = "The subject-specific databases shown below and provided by DBIS are free to access. If you are logged in with your user account, additional databases which are specifically licensed by your home library are also listed. As a rule, these can only be accessed via your respective university network or VPN access."
-
-licenses = "Databases"
-licenses_desc_1 = "Currently, you have access to:"
-licenses_desc_2 = "Further license offers are in preparation. You may also write us your suggestions, which offers should also be licensed. Please use our <a href="../Contact/ContactForm">contact form</a>.<br /><br /><br />Our <a href="../AdlrRegistration/Terms">terms of use</a> apply."
-licenses_forbidden_login_required = "These licenses are only available for registered users in certain user groups."
-licenses_forbidden_permission_denied = "Licensed resources are not available for your user group."
-licenses_not_available = "Licensed resources temporarily not available."
-licenses_notice_html = "Please use the newspaper archives for normal searches only. The licences granted are not designed for mass retrieval of newspaper pages (e.g. for text mining). Downloads beyond the usual level will lead to premature expiry of the licensed quotas and is at the expense of your colleagues.<br /><br />Please always contact us in advance by e-mail or via our <a data-lightbox href="%%contact_url%%">contact form</a> if you would like to retrieve a larger number of documents for a research project or use text mining. We will then get in touch with you. <br /><br />Please also note our <a data-lightbox href="%%terms_url%%">Terms of Use</a>.<br /><br />Thank you for your understanding."
-licenses_search = "Databases"
-licenses_text = "Here you have access to databases that have been specially licensed for you. We cover the costs for you."
diff --git a/themes/finc-accessibility/scss/compiled.scss b/themes/finc-accessibility/scss/compiled.scss
index db481aca78be66dffc9e30ba18c9a77e01996dbd..8f930d159bf8e12822d9efc884a244f2de7ca3c9 100644
--- a/themes/finc-accessibility/scss/compiled.scss
+++ b/themes/finc-accessibility/scss/compiled.scss
@@ -50,6 +50,20 @@
padding: 0;
}
+// adapt style for h3 in sidebar
+#myresearch-sidebar {
+ h3 {
+ font-size: $font-size-base;
+ margin: 0;
+ }
+
+ .facet-group:not(.active-filters) h3 {
+ @media (max-width: $screen-xs-max) {
+ padding-left: 0;
+ }
+ }
+}
+
// remove filter links styling
a.remove-filter {
display: flex;
diff --git a/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml b/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
index 3d2c763fce3e185c1e9f000fd9d06f4856a12c75..a6b0fc61aef449d149113027d54e4de90e0524bb 100644
--- a/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
+++ b/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
@@ -1,7 +1,8 @@
<!-- finc-accessibility - Recommend - SideFacets - filter-list.phtml -->
<?php /* #18509 copied from bootstrap for adding language tags to displayText */ ?>
<div class="facet-group active-filters">
- <div class="title"><?=$this->transEsc('Remove Filters')?> <span class="sr-only"><?=$this->transEsc('facet_deselect_hint') ?></span></div>
+ <?php /* change div of Remove Filters to h3, #19406 - VE */ ?>
+ <h3 class="title"><?=$this->transEsc('Remove Filters') ?> <span class="sr-only"><?=$this->transEsc('facet_deselect_hint') ?></span></h3>
<ul>
<?php foreach ($filterList as $field => $filters): ?>
<?php foreach ($filters as $i => $filter): ?>
diff --git a/themes/finc/templates/Recommend/SideFacets.phtml b/themes/finc/templates/Recommend/SideFacets.phtml
index 3e524b476825eedf817ba8fa2c8b110c3aadf186..1d1cf7105f04dae99e81838ceead34bcdb6f5e54 100644
--- a/themes/finc/templates/Recommend/SideFacets.phtml
+++ b/themes/finc/templates/Recommend/SideFacets.phtml
@@ -55,9 +55,12 @@ if ($hierarchicalFacets) {
<?php if (!empty($sideFacetSet) && $results->getResultTotal() > 0): ?>
<?php foreach ($sideFacetSet as $title => $cluster): ?>
<div class="facet-group" id="side-panel-<?=$this->escapeHtmlAttr($title)?>">
- <a <?php if(in_array($title, $collapsedFacets)): ?>class="title collapsed" aria-expanded="false"<?php else: ?>class="title" aria-expanded="true"<?php endif ?> data-toggle="collapse" href="#side-collapse-<?=$this->escapeHtmlAttr($title) ?>" >
- <?=$this->transEsc($cluster['label'])?> <span class="sr-only"><?=$this->transEsc('facet_select_hint') ?></span>
- </a>
+ <?php /* add h3, #19406 - VE */ ?>
+ <h3>
+ <a <?php if(in_array($title, $collapsedFacets)): ?>class="title collapsed" aria-expanded="false"<?php else: ?>class="title" aria-expanded="true"<?php endif ?> data-toggle="collapse" href="#side-collapse-<?=$this->escapeHtmlAttr($title) ?>" >
+ <?=$this->transEsc($cluster['label'])?> <span class="sr-only"><?=$this->transEsc('facet_select_hint') ?></span>
+ </a>
+ </h3>
<ul id="side-collapse-<?=$this->escapeHtmlAttr($title)?>" class="collapse<?php if (!in_array($title, $collapsedFacets)): ?> in<?php endif ?>">
<?=$this->context($this)->renderInContext(
'Recommend/SideFacets/facet.phtml',
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/data-rvk.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/data-rvk.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..b113b53c7c9366f25cccbebd4de45742462601e9
--- /dev/null
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/data-rvk.phtml
@@ -0,0 +1,26 @@
+<!-- finc: RecordDriver - DefaultRecord - data-rvk -->
+<tr>
+ <th><?=$this->transEsc('RVK')?>:</th>
+ <td data-title="<?= $this->transEsc('RVK') ?>:">
+ <?php $i = 0; foreach ($data as $item): ?>
+ <?=($i > 0 ? "<br />" : "") //no linebreak after last item?>
+ <?=$item['rvk']?>
+ <?php if (isset($item['level']) || isset($item['name'])): ?>
+ <?php
+ $tooltip_content = "<ul class='no-bullet'>" . (isset($item['name']) ? "<li><strong>" . $item['name'] . "</strong></li>" : "");
+ if (isset($item['level']) && count($item['level'])) {
+ foreach ($item['level'] as $level) {
+ $tooltip_content .= "<li>" . $level . "</li>";
+ }
+ }
+ $tooltip_content .= "</ul>";
+ ?>
+ <?php endif; ?>
+ <span <?=(isset($tooltip_content) ? 'data-toggle="tooltip" data-html="true" title="' . $tooltip_content . '"' : "")?>>
+ <a href="<?=$this->record($this->driver)->getLink('rvk', $item['rvk'])?>"> <i class="fa fa-search" aria-hidden="true"></i> <?=$this->transEsc('Find Similar Items');?></a>
+ </span>
+ <?php $i++; ?>
+ <?php endforeach; ?>
+ </td>
+</tr>
+<!-- finc: RecordDriver - DefaultRecord - data-rvk - END -->
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/data-topics.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/data-topics.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..d0276526570eac7a531d3362e9416630abe6744f
--- /dev/null
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/data-topics.phtml
@@ -0,0 +1,25 @@
+<!-- finc: RecordDriver - DefaultRecord - data-topics -->
+<tr>
+ <th><?=$this->transEsc('Subjects')?>: </th>
+ <td data-title="<?= $this->transEsc('Subjects') ?>:">
+ <?php foreach ($data as $field): ?>
+ <div class="subject-line" property="keywords">
+ <?php $subject = ''; ?>
+ <?php
+ if (count($field) == 1 && !isset($field['subject'])) {
+ $field = explode('--', $field[0]);
+ }
+ ?>
+ <?php if (isset($field['subject'])): /* extended topics */?>
+ <?php $field = $field['subject']; ?>
+ <?php endif; ?>
+ <?php $i = 0; foreach ($field as $subfield): ?>
+ <?=($i++ == 0) ? '' : ' > '?>
+ <?php $subject = trim($subject . ' ' . $subfield); ?>
+ <a title="<?=$this->escapeHtmlAttr($subject)?>" href="<?=$this->record($this->driver)->getLink('subject', $subject)?>" rel="nofollow"><?=trim($this->escapeHtml($subfield))?></a>
+ <?php endforeach; ?>
+ </div>
+ <?php endforeach; ?>
+ </td>
+</tr>
+<!-- finc: RecordDriver - DefaultRecord - data-topics - END -->
diff --git a/themes/finc/templates/RecordTab/topics.phtml b/themes/finc/templates/RecordTab/topics.phtml
index 40d1f149f839a6b4f7ab6fa43499d9ce7711dd26..7e7d46803351f161e13563d87143fcd18bc38bd0 100644
--- a/themes/finc/templates/RecordTab/topics.phtml
+++ b/themes/finc/templates/RecordTab/topics.phtml
@@ -2,63 +2,17 @@
<?php
// Set page title.
$this->headTitle($this->translate('Topics') . ': ' . $this->driver->getBreadcrumb());
-
+$formatter = $this->recordDataFormatter();
+$rvk = $formatter->getData($this->driver, $formatter->getDefaults('rvk'));
+$topics = $formatter->getData($this->driver, $formatter->getDefaults('topics'));
?>
<table class="table table-striped table-resp-data">
<caption><span class="sr-only"><?=$this->transEsc('Topics')?></span></caption>
-<?php if ($rvk = $this->driver->tryMethod('getRvkWithMetadata')): ?>
- <?php $contentDisplayed = true; ?>
- <tr>
- <th><?=$this->transEsc('RVK')?>:</th>
- <td data-title="<?= $this->transEsc('RVK') ?>:">
- <?php $i = 0; foreach ($rvk as $item): ?>
- <?=($i>0?"<br />":"") //no linebreak after last item ?>
- <?=$item['rvk']?>
- <?php if (isset($item['level']) || isset($item['name'])): ?>
- <?php
- $tooltip_content = "<ul class='no-bullet'>" . (isset($item['name']) ? "<li><strong>" . $item['name'] . "</strong></li>" : "");
- if (isset($item['level']) && count($item['level'])) {
- foreach ($item['level'] as $level) {
- $tooltip_content .= "<li>" . $level . "</li>";
- }
- }
- $tooltip_content .= "</ul>";
- ?>
- <?php endif; ?>
- <span <?=(isset($tooltip_content) ? 'data-toggle="tooltip" data-html="true" title="' . $tooltip_content . '"' : "")?>>
- <a href="<?=$this->record($this->driver)->getLink('rvk', $item['rvk'])?>"> <i class="fa fa-search" aria-hidden="true"></i> <?=$this->transEsc('Find Similar Items');?></a>
- </span>
- <?php $i++; ?>
- <?php endforeach; ?>
- </td>
- </tr>
-<?php endif; ?>
-
-<?php $topics = $this->driver->getTopics(); if (!empty($topics) && is_array($topics)): ?>
- <?php $contentDisplayed = true; ?>
- <tr>
- <th><?=$this->transEsc('Subjects')?>: </th>
- <td data-title="<?= $this->transEsc('Subjects') ?>:">
- <?php foreach ($topics as $field): ?>
- <div class="subject-line" property="keywords">
- <?php $subject = ''; ?>
- <?php if(count($field) == 1 && !isset($field['subject'])) $field = explode('--', $field[0]); ?>
- <?php if(isset($field['subject'])): // extended topics ?>
- <?php $field = $field['subject']; ?>
- <?php endif; ?>
- <?php $i = 0; foreach ($field as $subfield): ?>
- <?=($i++ == 0) ? '' : ' > '?>
- <?php $subject = trim($subject . ' ' . $subfield); ?>
- <a title="<?=$this->escapeHtmlAttr($subject)?>" href="<?=$this->record($this->driver)->getLink('subject', $subject)?>" rel="nofollow"><?=trim($this->escapeHtml($subfield))?></a>
- <?php endforeach; ?>
- </div>
- <?php endforeach; ?>
- </td>
- </tr>
-<?php endif; ?>
-
-<?php if (!isset($contentDisplayed) || !$contentDisplayed): // Avoid errors if there were no rows above ?>
- <tr><td><?=$this->transEsc('Topics unavailable')?></td></tr>
-<?php endif; ?>
+ <?php foreach ($rvk as $rvkItem): ?>
+ <?= $rvkItem['value'] ?? ''?>
+ <?php endforeach; ?>
+ <?php foreach ($topics as $topicsItem): ?>
+ <?= $topicsItem['value'] ?? ''?>
+ <?php endforeach; ?>
</table>
<!-- finc: recordtab - topics - END -->