From 1560cf29048d634e49f121e756b787230537bf3f Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Wed, 10 Jun 2020 22:52:04 +0200
Subject: [PATCH] refs #17752 [finc v5] handle cover and style based icons
* reset to original operating mode: first cover, then style based icons
** Default core
** SolrAI core
** SolrMarc core
* but if cover cannot be loaded, then use style based icon as fallback
** by using object tag with inner icon
** by setting content of fallback icon noCover2 to empty => interpreted as no content in browser
* add new fallback icon instead of changing existing
** keep noCover2.gif unchanged, but add new empty file noCoverEmpty.gif
** use noCoverEmpty.gif in finc as default noCoverAvailableImage set in config.ini
** after merging this branch, instances won't have a noCoverAvailableImage anymore:
*** either set noCoverAvailableImage = images/noCover2.gif in instance config.ini
*** or use object tag in core templates as in master core templates
co-authored by: "ckaz <kazzer@uni-leipzig.de>"
refs #17752 [finc vf5] fixes record view icon placement
* fixes record view icon placement for left-aligned facets in
** DefaultRecord/core
** SolrAi/core
** SolrMarc/core
* fixes style-based icon display with left-aligned facets
* corrects switchable ini-settings for displaying either stylebasedicons
or other icons/covers
* adds definition for right-floating record view icons when sidebar is
left-aligned
---
local/config/vufind/config.ini | 2 +-
themes/finc/images/noCoverEmpty.gif | 0
themes/finc/scss/compiled.scss | 6 ++
.../RecordDriver/DefaultRecord/core.phtml | 44 +++++++-------
.../templates/RecordDriver/SolrAI/core.phtml | 57 ++++++++++--------
.../RecordDriver/SolrMarc/core.phtml | 60 ++++++++++---------
6 files changed, 94 insertions(+), 75 deletions(-)
create mode 100644 themes/finc/images/noCoverEmpty.gif
diff --git a/local/config/vufind/config.ini b/local/config/vufind/config.ini
index 930b4625c6f..105b8f61ada 100644
--- a/local/config/vufind/config.ini
+++ b/local/config/vufind/config.ini
@@ -635,7 +635,7 @@ coverimagesCache = true
; Otherwise, you can use noCoverAvailableImage to specify a
; path relative to the base of your theme directory for a static image to display.
-noCoverAvailableImage = images/noCover2.gif
+noCoverAvailableImage = images/noCoverEmpty.gif
; You can select from Syndetics, SyndeticsPlus, Amazon Editorial, Amazon, Booksite
; and/or the Guardian
diff --git a/themes/finc/images/noCoverEmpty.gif b/themes/finc/images/noCoverEmpty.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index c7c3e947032..fc943707ed8 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -1682,6 +1682,12 @@ footer {
width: 100%;
}
+// push record view icon to right (Desktop) on left-aligned sidebars -- pls NOTE: required offcanvas = true
+.offcanvas-left .media-left {
+ @media (min-width: $screen-sm-min) {
+ float: right;
+ }
+}
//// Off-Canvas - END
// SEARCH CONTROLS - END
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/core.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/core.phtml
index a2dfff1cc2c..dc3020e57e1 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/core.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/core.phtml
@@ -1,7 +1,7 @@
<!-- finc: RecordDriver - DefaultRecord - core -->
-<div class="media" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product">
+<div class="media" vocab="http://schema.org/" resource="#record" typeof="<?= $this->driver->getSchemaOrgFormats() ?> Product">
<?php /* finc: use VF5.1 offcanvas toggler here as well if you have a custom sidebar - CK */ ?>
- <?=$this->render('RecordDriver/DefaultRecord/offcanvas-toggler'); ?>
+ <?= $this->render('RecordDriver/DefaultRecord/offcanvas-toggler'); ?>
<?php
$QRCode = $this->record($this->driver)->getQRCode("core");
$coverDetails = $this->record($this->driver)->getCoverDetails('core', 'medium', $this->record($this->driver)->getThumbnail('large'));
@@ -9,35 +9,38 @@
$preview = $this->record($this->driver)->getPreviews();
?>
<?php if ($QRCode || $cover || $preview): ?>
- <div class="media-left <?=$this->escapeHtmlAttr($coverDetails['size'])?> img-col">
+ <div class="media-left <?= $this->escapeHtmlAttr($coverDetails['size']) ?> img-col">
<?php /* Display thumbnail if appropriate: */ ?>
<?php if ($cover): ?>
- <?=$cover?>
- <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, false position - GG */ ?>
+ <object type="image/jpeg" data="<?=$coverDetails['link']?>">
+ <?= $this->record($this->driver)->getRecordIcon() ?>
+ </object>
<?php endif; ?>
<?php /* Display qrcode if appropriate: */ ?>
<?php if ($QRCode): ?>
<span class="hidden-xs">
- <br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
+ <br/><img alt="<?= $this->transEsc('QR Code') ?>" class="qrcode" src="<?= $this->escapeHtmlAttr($QRCode); ?>"/>
</span>
<?php endif; ?>
<?php // if you have a preview tab but want to move or remove the preview link
// from this area of the record view, this can be split into
// getPreviewData() (should stay here) and
- // getPreviewLink() (can go in your desired tab) ?>
+ // getPreviewLink() (can go in your desired tab)?>
<?php if ($preview): ?>
<div class="record-previews">
- <?=$preview?>
+ <?= $preview ?>
</div>
<?php endif; ?>
</div>
- <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, right position - GG */ ?>
- <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
- <?=$this->record($this->driver)->getRecordIcon()?>
- <?php /* EOF - finc-specific StyleBasedIcons */ ?>
- <?php endif; ?>
+ <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
+ <?php /* BOF - finc-specific StyleBasedIcons */ ?>
+ <div class="media-left <?= $this->escapeHtmlAttr($coverDetails['size']) ?> img-col">
+ <?= $this->record($this->driver)->getRecordIcon() ?>
+ </div>
+ <?php endif; ?>
+
<div class="media-body">
<?php /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars;
@@ -45,22 +48,23 @@
*/
?>
<?php /* finc: add schema tags for title #13850 - VE */ ?>
- <h1 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h1>
+ <h1
+ property="name"><?= $this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100))) ?></h1>
<?php $summary = $this->driver->getSummary();
$summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?>
<?php if ($summary): ?>
- <p><?=$this->truncate($summary, 300)?></p>
+ <p><?= $this->truncate($summary, 300) ?></p>
<?php if (strlen($summary) > 300): ?>
- <p class="hidden-print"><a href='<?=$this->recordLink()->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
+ <p class="hidden-print"><a href='<?= $this->recordLink()->getTabUrl($this->driver, 'Description') ?>#tabnav'><?= $this->transEsc('Full description') ?></a></p>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->userlist()->getMode() !== 'disabled'): ?>
<?php /* Display the lists that this record is saved to */ ?>
<div class="savedLists hidden alert alert-info">
- <strong><?=$this->transEsc("Saved in")?>:</strong>
+ <strong><?= $this->transEsc("Saved in") ?>:</strong>
</div>
<?php endif; ?>
@@ -72,11 +76,11 @@
<?php if (!empty($coreFields)): ?>
<?php /* include responsive data table - CK */ ?>
<table class="table table-striped table-resp-data">
- <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
+ <caption class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></caption>
<?php foreach ($coreFields as $current): ?>
<tr>
- <th><?=$this->transEsc($current['label'])?>:</th>
- <td data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td>
+ <th><?= $this->transEsc($current['label']) ?>:</th>
+ <td data-title="<?= $this->transEsc($current['label']) ?>:"><?= $current['value'] ?></td>
</tr>
<?php endforeach; ?>
</table>
diff --git a/themes/finc/templates/RecordDriver/SolrAI/core.phtml b/themes/finc/templates/RecordDriver/SolrAI/core.phtml
index b5bfed99524..1ca3a8236e4 100644
--- a/themes/finc/templates/RecordDriver/SolrAI/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrAI/core.phtml
@@ -1,8 +1,8 @@
<!-- finc: recordDriver - SolrAI - core -->
<?php /* Created in 4826, based on DefaultRecord/core, compare with DefaultRecord/core during updates! */ ?>
-<div class="media" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product">
+<div class="media" vocab="http://schema.org/" resource="#record" typeof="<?= $this->driver->getSchemaOrgFormats() ?> Product">
<?php /* finc: use VF5.1 offcanvas toggler here as well if you have a custom sidebar - CK */ ?>
- <?=$this->render('RecordDriver/DefaultRecord/offcanvas-toggler'); ?>
+ <?= $this->render('RecordDriver/DefaultRecord/offcanvas-toggler'); ?>
<?php
$QRCode = $this->record($this->driver)->getQRCode("core");
$coverDetails = $this->record($this->driver)->getCoverDetails('core', 'medium', $this->record($this->driver)->getThumbnail('large'));
@@ -10,34 +10,36 @@
$preview = $this->record($this->driver)->getPreviews();
?>
<?php if ($QRCode || $cover || $preview): ?>
- <div class="media-left <?=$this->escapeHtmlAttr($coverDetails['size'])?> img-col">
+ <div class="media-left <?= $this->escapeHtmlAttr($coverDetails['size']) ?> img-col">
<?php /* Display thumbnail if appropriate: */ ?>
- <?php if($cover): ?>
- <?=$cover?>
- <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, false position - GG */ ?>
+ <?php if ($cover): ?>
+ <object type="image/jpeg" data="<?=$coverDetails['link']?>">
+ <?= $this->record($this->driver)->getRecordIcon() ?>
+ </object>
<?php endif; ?>
<?php /* Display qrcode if appropriate: */ ?>
- <?php if($QRCode): ?>
+ <?php if ($QRCode): ?>
<span class="hidden-xs">
- <br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
+ <br/><img alt="<?= $this->transEsc('QR Code') ?>" class="qrcode" src="<?= $this->escapeHtmlAttr($QRCode); ?>"/>
</span>
<?php endif; ?>
<?php // if you have a preview tab but want to move or remove the preview link
// from this area of the record view, this can be split into
// getPreviewData() (should stay here) and
- // getPreviewLink() (can go in your desired tab) ?>
+ // getPreviewLink() (can go in your desired tab)?>
<?php if ($preview): ?>
<div class="record-previews">
- <?=$preview?>
+ <?= $preview ?>
</div>
<?php endif; ?>
</div>
- <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, right position - GG */ ?>
<?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
- <?=$this->record($this->driver)->getRecordIcon()?>
- <?php /* EOF - finc-specific StyleBasedIcons */ ?>
+ <?php /* BOF - finc-specific StyleBasedIcons */ ?>
+ <div class="media-left <?= $this->escapeHtmlAttr($coverDetails['size']) ?> img-col">
+ <?= $this->record($this->driver)->getRecordIcon() ?>
+ </div>
<?php endif; ?>
<div class="media-body">
@@ -46,25 +48,27 @@
*/
?>
<?php /* finc: add schema tags for title #13850 - VE */ ?>
- <h1 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h1>
+ <h1
+ property="name"><?= $this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100))) ?></h1>
- <?php $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?>
+ <?php $summary = $this->driver->getSummary();
+ $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?>
<?php if ($summary): ?>
- <p><?=$this->truncate($summary, 300)?></p>
+ <p><?= $this->truncate($summary, 300) ?></p>
- <?php if(strlen($summary) > 300): ?>
- <p class="hidden-print"><a href='<?=$this->recordLink()->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
+ <?php if (strlen($summary) > 300): ?>
+ <p class="hidden-print"><a href='<?= $this->recordLink()->getTabUrl($this->driver, 'Description') ?>#tabnav'><?= $this->transEsc('Full description') ?></a></p>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->userlist()->getMode() !== 'disabled'): ?>
<?php /* Display the lists that this record is saved to */ ?>
<div class="savedLists hidden alert alert-info">
- <strong><?=$this->transEsc("Saved in")?>:</strong>
+ <strong><?= $this->transEsc("Saved in") ?>:</strong>
</div>
<?php endif; ?>
- <?php /* Display Main Details */?>
+ <?php /* Display Main Details */ ?>
<?php
$formatter = $this->recordDataFormatter();
$coreFields = $formatter->getData($driver, $formatter->getDefaults('core-ai'));
@@ -72,17 +76,20 @@
<?php if (!empty($coreFields)): ?>
<?php /* include responsive data table - CK */ ?>
<table class="table table-striped table-resp-data">
- <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
+ <caption class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></caption>
<?php foreach ($coreFields as $current): ?>
<?php if ($current['label'] == null): ?>
- <?=$current['value']?>
+ <?= $current['value'] ?>
<?php else: ?>
- <tr><th><?=$this->transEsc($current['label'])?>:</th><td data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td></tr>
+ <tr>
+ <th><?= $this->transEsc($current['label']) ?>:</th>
+ <td><?= $current['value'] ?></td>
+ </tr>
<?php endif; ?>
<?php endforeach; ?>
</table>
<?php endif; ?>
- <?php /* End Main Details */?>
- </div>
+ <?php /* End Main Details */ ?>
</div>
+</div>
<!-- recordDriver - solrAI - CORE - END -->
diff --git a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
index 2992f968984..21d74fbc3a3 100644
--- a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
@@ -1,46 +1,46 @@
<!-- finc: RecordDriver - solrMarc - core -->
<?php /* based on DefaultRecord/core, compare with DefaultRecord/core during updates! */ ?>
-<div class="media" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product">
+<div class="media" vocab="http://schema.org/" resource="#record" typeof="<?= $this->driver->getSchemaOrgFormats() ?> Product">
<?php /* finc: use VF5.1 offcanvas toggler here as well if you have a custom sidebar - CK */ ?>
- <?=$this->render('RecordDriver/DefaultRecord/offcanvas-toggler'); ?>
+ <?= $this->render('RecordDriver/DefaultRecord/offcanvas-toggler'); ?>
<?php
$QRCode = $this->record($this->driver)->getQRCode("core");
- $coverDetails = $this->record($this->driver)->getCoverDetails('core', 'medium', $this->record($this->driver)->getThumbnail('large'));
+ $coverDetails = $this->record($this->driver)->getCoverDetails('core', 'medium', $this->record($this->driver)->getThumbnail('medium'));
$cover = $coverDetails['html'];
$preview = $this->record($this->driver)->getPreviews();
?>
<?php if ($QRCode || $cover || $preview): ?>
<div class="media-left <?=$this->escapeHtmlAttr($coverDetails['size'])?> img-col">
<?php /* Display thumbnail if appropriate: */ ?>
- <?php if($cover): ?>
- <?=$cover?>
- <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, false position - GG */ ?>
+ <?php if ($cover): ?>
+ <object type="image/jpeg" data="<?=$coverDetails['link']?>">
+ <?= $this->record($this->driver)->getRecordIcon() ?>
+ </object>
<?php endif; ?>
<?php /* Display qrcode if appropriate: */ ?>
- <?php if($QRCode): ?>
+ <?php if ($QRCode): ?>
<span class="hidden-xs">
- <br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
+ <br/><img alt="<?= $this->transEsc('QR Code') ?>" class="qrcode" src="<?= $this->escapeHtmlAttr($QRCode); ?>"/>
</span>
<?php endif; ?>
<?php // if you have a preview tab but want to move or remove the preview link
// from this area of the record view, this can be split into
// getPreviewData() (should stay here) and
- // getPreviewLink() (can go in your desired tab) ?>
+ // getPreviewLink() (can go in your desired tab)?>
<?php if ($preview): ?>
<div class="record-previews">
- <?=$preview?>
+ <?= $preview ?>
</div>
<?php endif; ?>
</div>
- <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, right position - GG */ ?>
- <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
+ <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
<?php /* BOF - finc-specific StyleBasedIcons */ ?>
- <div class="media-left <?=$this->escapeHtmlAttr($coverDetails['size'])?> img-col">
- <?=$this->record($this->driver)->getRecordIcon()?>
+ <div class="media-left <?= $this->escapeHtmlAttr($coverDetails['size']) ?> img-col">
+ <?= $this->record($this->driver)->getRecordIcon() ?>
</div>
- <?php endif; ?>
+ <?php endif; ?>
<div class="media-body">
<?php /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars;
@@ -48,25 +48,27 @@
*/
?>
<?php /* finc: add schema tags for title #13850 - VE */ ?>
- <h1 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h1>
+ <h1
+ property="name"><?= $this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100))) ?></h1>
- <?php $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?>
+ <?php $summary = $this->driver->getSummary();
+ $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?>
<?php if ($summary): ?>
- <p><?=$this->truncate($summary, 300)?></p>
+ <p><?= $this->truncate($summary, 300) ?></p>
- <?php if(strlen($summary) > 300): ?>
- <p class="hidden-print"><a href='<?=$this->recordLink()->getTabUrl($this->driver, 'Description')?>#tabnav'><?=$this->transEsc('Full description')?></a></p>
+ <?php if (strlen($summary) > 300): ?>
+ <p class="hidden-print"><a href='<?= $this->recordLink()->getTabUrl($this->driver, 'Description') ?>#tabnav'><?= $this->transEsc('Full description') ?></a></p>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->userlist()->getMode() !== 'disabled'): ?>
<?php /* Display the lists that this record is saved to */ ?>
- <div class="savedLists hidden alert alert-info">
- <strong><?=$this->transEsc("Saved in")?>:</strong>
+ <div class="savedLists hidden alert alert-info">
+ <strong><?= $this->transEsc("Saved in") ?>:</strong>
</div>
<?php endif; ?>
- <?php /* Display Main Details */?>
+ <?php /* Display Main Details */ ?>
<?php
$formatter = $this->recordDataFormatter();
$coreFields = $formatter->getData($driver, $formatter->getDefaults('core-marc'));
@@ -74,20 +76,20 @@
<?php if (!empty($coreFields)): ?>
<?php /* include responsive data table - CK */ ?>
<table class="table table-striped table-resp-data">
- <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
+ <caption class="sr-only"><?= $this->transEsc('Bibliographic Details') ?></caption>
<?php foreach ($coreFields as $current): ?>
<?php if ($current['label'] == null): ?>
- <?=$current['value']?>
+ <?= $current['value'] ?>
<?php else: ?>
<tr>
- <th><?=$this->transEsc($current['label'])?>:</th>
- <td data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td>
+ <th><?= $this->transEsc($current['label']) ?>:</th>
+ <td data-title="<?= $this->transEsc($current['label']) ?>:"><?= $current['value'] ?></td>
</tr>
<?php endif; ?>
<?php endforeach; ?>
</table>
<?php endif; ?>
- <?php /* End Main Details */?>
- </div>
+ <?php /* End Main Details */ ?>
</div>
+</div>
<!-- finc: RecordDriver - solrMarc - core - END -->
--
GitLab