From 0ced3c19ad00e54e80a95d2c6db5427ec511f485 Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Thu, 7 Nov 2019 10:12:29 +0100
Subject: [PATCH] refs #16286 [fid_adlr] style get-it-box
* fine tuning of ordering of links
* dont use side-panels on detail record, instead display get-it-box within media-body
* fix internal format on detail view
* remove toggler for sidebar
* remove box from sidebar in SolrAI and SolrMarc also
** set new breakpoint for full width of get-it-box: small-medium-max (col-md)
** rearrange title icons like mock-ups for different screens
** fix footer right padding (if within main)
* fix styling for PDA
** differentiate between full and partly copy
** set border radius for both get it box (amber and azure) like mockup
* style text for pda partcopy notice
---
themes/fid_adlr/scss/_customVariables.scss | 4 +-
themes/fid_adlr/scss/compiled.scss | 167 +++++++++++++++--
.../RecordDriver/DefaultRecord/core.phtml | 96 +++++++---
.../templates/RecordDriver/SolrAI/core.phtml | 170 +++++++++++-------
.../RecordDriver/SolrMarc/core.phtml | 137 +++++++++-----
.../templates/RecordTab/acquisitionpda.phtml | 4 +-
.../templates/RecordTab/holdingsils.phtml | 8 +-
.../{side-panel-links.phtml => links.phtml} | 6 +-
themes/fid_adlr/templates/record/view.phtml | 56 ------
9 files changed, 440 insertions(+), 208 deletions(-)
rename themes/fid_adlr/templates/get-it-box/{side-panel-links.phtml => links.phtml} (90%)
diff --git a/themes/fid_adlr/scss/_customVariables.scss b/themes/fid_adlr/scss/_customVariables.scss
index 20d478f6511..dd508f3e0cc 100644
--- a/themes/fid_adlr/scss/_customVariables.scss
+++ b/themes/fid_adlr/scss/_customVariables.scss
@@ -347,8 +347,8 @@ $max-designed-body-width: 1926px;
//$breadcrumb-active-color: $btn-primary-color !default;
//// Sidebar item hover effect (doesn't exist in VF out-of-the-box); active is for selected facets
-$get-it-button-offset-left: 40px;
-$get-it-link-offset-left: 28px;
+$get-it-button-offset-left: 42px;
+$get-it-link-offset-left: 10px;
//$sidebar-item-hover-bg: transparentize($brand-secondary, .9) !default;
//$sidebar-item-active-hover-bg: transparentize($brand-primary, .1) !default;
diff --git a/themes/fid_adlr/scss/compiled.scss b/themes/fid_adlr/scss/compiled.scss
index 2eda77643c6..c1d9befc31a 100644
--- a/themes/fid_adlr/scss/compiled.scss
+++ b/themes/fid_adlr/scss/compiled.scss
@@ -1800,7 +1800,8 @@ input.searchForm_lookfor {
.footer {
background: transparent;
max-width: 1284px;
- // FIXME EXPERIMENTAL width: 70%;
+ border: 0;
+ padding-right: 0;
}
&.collapsing {
@@ -1808,9 +1809,67 @@ input.searchForm_lookfor {
min-height: 0;
transition: none !important;
}
- @media screen and (max-width: $screen-xs-max) {
+ .record {
.mainbody {
+ padding-bottom: 2em;
+ padding-right: 0;
+ padding-top: 2em;
width: 100%;
+ @media screen and (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
+ padding-bottom: 4em;
+ }
+ @media screen and (min-width: $screen-lg-min) {
+ padding-bottom: 4em;
+ padding-right: 0;
+ padding-top: 6em;
+ }
+
+ .media-body {
+ overflow: visible;
+ padding-bottom: 3em;
+
+ @media screen and (max-width: $screen-xs-max) {
+ padding-top: 3em;
+ }
+
+ @media screen and (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
+ padding-top: 6em;
+ }
+ }
+ }
+ .media {
+ padding-bottom: 2em;
+ @media screen and (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
+ padding-bottom: 4em;
+ padding-left: 0;
+ padding-right: 0;
+ }
+ @media screen and (min-width: $screen-lg-min) {
+ padding-bottom: 7em;
+ }
+ }
+ .media-left {
+ display: inline-block;
+ padding-left: 15px;
+ @media screen and (max-width: $screen-md-max) {
+ position: absolute; /* FIXME: better solution to switch order between div title elements ? */
+ }
+ @media screen and (min-width: $screen-lg-min) {
+ display: table-cell;
+ }
+ }
+ .record-tabs {
+ @media screen and (max-width: $screen-md-max) {
+ padding-left: 0;
+ }
+ }
+ }
+
+ .record div[id^="side-panel-"] {
+ margin-left: 15px;
+ margin-right: 15px;
+ @media screen and (min-width: $screen-lg-min) {
+ width: 68%;
}
}
@@ -1944,17 +2003,40 @@ input.searchForm_lookfor {
}
.title-toolbar {
+ @media screen and (max-width: $screen-xs-max) {
+ display: flex;
+ flex-direction: column-reverse;
+ }
// FIXME: BITTE ALS SONDERFALL unter H3 definieren
h3 {
font-size: 24px;
}
& > .toolbar-details {
+ @media screen and (max-width: $screen-xs-max) {
+ display: inline-flex;
+ flex-direction: row-reverse;
+ position: relative;
+ top: -3em;
+ }
+ @media screen and (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
+ display: inline-flex;
+ flex-direction: row-reverse;
+ padding-top: em(3px);
+ }
padding-top: 12px;
// FIXME: SCHACHTELUNG NOETIG?
& > .toolbar-menu {
- padding-top: 26px;
+ display: inline;
+ @media screen and (min-width: $screen-lg-min) {
+ display: block;
+ padding-top: em(20px);
+ }
}
}
+ .favorite {
+ display: inline-block;
+ padding-left: 1em;
+ }
}
// FIXME: Bitte nach oben in den allgemeinen Teil bei UL als Sonderfall definieren
@@ -1982,7 +2064,7 @@ div[id^="side-panel-"] {
}
// FIXME: IST DER div NOETIG?
-div[id^="side-panel-links"] {
+div[id^="get-it-links"] {
@include accordeon('get-it');
}
@@ -1990,14 +2072,12 @@ div[id^="side-panel-links"] {
div[class$="-tab"] {
.media-body {
+ display: inline;
+
strong {
color: $asphalt;
}
}
-
- .media-left {
- padding-right: 88px;
- }
}
.record-tabs.detailview-box-yellow {
@@ -2009,10 +2089,16 @@ div[class$="-tab"] {
}
.getitbox {
+ @media screen and (min-width: $screen-lg-min) {
+ position: absolute;
+ }
.getitbox-getit {
background-color: $midnight;
+ margin-bottom: 2em;
padding: 12px;
- margin-bottom: 3em;
+ @media screen and (max-width: $screen-sm-max) {
+ margin-top: 2em;
+ }
button:focus {
outline: none;
}
@@ -2023,13 +2109,15 @@ div[class$="-tab"] {
.getitbox-notices {
@include result-list-border($midnight-medium);
padding: 12px;
+ word-break: break-word;
}
#side-collapse-links-data {
margin-left: $get-it-link-offset-left;
padding: 12px;
a {
color: $white;
- word-break: break-all;
+ display: inline-flex;
+ word-break: break-word;
word-wrap: break-word;
&:active,
&:focus,
@@ -2042,6 +2130,7 @@ div[class$="-tab"] {
display: inline;
margin-left: -$get-it-link-offset-left;
padding-right: 5px;
+ padding-top: 3px;
vertical-align: unset;
@media screen and (max-width: $screen-md-max) {
@@ -2051,28 +2140,69 @@ div[class$="-tab"] {
}
.pda-button {
+ background: transparent;
+ border-radius: 2px;
+ font-family: $font-family-monospace;
+ letter-spacing: 1.5px;
+ padding-left: 8px;
+ padding-right: 8px;
+ text-transform: uppercase;
+ width: 99%;
+ &.part-order {
+ border: 3px solid $white;
+ color: $white;
+ }
+ &.full-order {
+ border: 3px solid $amber;
+ color: $amber;
+ margin-bottom: 2em;
+ }
+ &:hover,
+ &:focus {
+ background: transparent;
+ }
+ }
+ .pda-part-text {
+ color: $white;
+ font-size: smaller;
margin-bottom: 2em;
+ text-align: center;
+ width: 100%;
}
- #side-panel-links-amber {
+ #get-it-links-amber {
@include result-list-border($amber);
+ border-radius: 2px;
button {
background-color: $amber;
color: $midnight;
+ letter-spacing: 2px;
padding-left: $get-it-button-offset-left;
+ word-break: break-word;
}
}
- #side-panel-links-azure {
+ #get-it-links-azure {
@include result-list-border($azure);
button {
background-color: $azure;
- color: $midnight;
+ border-radius: 2px;
+ color: $white;
+ letter-spacing: 2px;
padding-left: $get-it-button-offset-left;
+ word-break: break-word;
}
}
}
+
+.record #side-collapse-Details {
+ word-break: break-word;
+ th {
+ min-width: 170px;
+ text-align: left;
+ }
+}
// ++ DETAILS/RECORD VIEW - END
// ++ ADVANCED SEARCH
@@ -2358,13 +2488,18 @@ div[class$="-tab"] {
// +++++ Footer - START
// styling follows mobile first principles
-footer,
-.main footer {
+.main footer .container{
+ margin-right: 15px;
+}
+
+.main footer,
+footer {
// general footer styles
all: inherit;
- background-image: url('../images/footer-dummy-background.png');
background-repeat: no-repeat;
background-size: cover;
+ background-image: url('../images/footer-dummy-background.png');
+ color: $white;
a:hover,
a:link,
diff --git a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml
index 98a63131821..1b2ba607360 100644
--- a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml
@@ -1,7 +1,5 @@
<!-- fid_adlr: RecordDriver - DefaultRecord - core -->
<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'); ?>
<?php
$QRCode = $this->record($this->driver)->getQRCode("core");
$coverDetails = $this->record($this->driver)->getCoverDetails('core', 'medium', $this->record($this->driver)->getThumbnail('large'));
@@ -40,7 +38,8 @@
</div>
<?php endif; ?>
<div class="media-body">
- <div class="title-toolbar">
+ <div class="col-md-8">
+ <div class="title-toolbar">
<div class="result-body">
<?php /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars;
in finc: keep schema name tag here!! #13861 - CK
@@ -62,9 +61,11 @@
<?php if ($this->userlist()->getMode() !== 'disabled'): ?>
<?php if ($this->permission()->allowDisplay('feature.Favorites')): ?>
<?php /* Add to favorites; finc: keep Icon inside link - CK */ ?>
- <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>">
- <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> <span class="hidden-xs hidden-sm"><?/* =$this->transEsc('Add to favorites') */?></span>
- </a><br/>
+ <div class="favorite">
+ <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>">
+ <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> <span class="hidden-xs hidden-sm"><?/* =$this->transEsc('Add to favorites') */?></span>
+ </a>
+ </div>
<div class="toolbar-menu">
<a href="#" data-lightbox class="dropdown-toggle" id="toolbar-menu"
data-toggle="dropdown" aria-controls="toolbar-menu">
@@ -86,23 +87,72 @@
</div>
</div>
- <?php /* Display Main Details */ ?>
- <?php
- $formatter = $this->recordDataFormatter();
- $coreFields = $formatter->getData($this->driver, $formatter->getDefaults('core'));
- ?>
- <?php if (!empty($coreFields)): ?>
- <table class="table table-striped">
- <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
- <?php foreach ($coreFields as $current): ?>
- <tr>
- <th><?=$this->transEsc($current['label'])?>:</th>
- <td><?=$current['value']?></td>
- </tr>
- <?php endforeach; ?>
- </table>
- <?php endif; ?>
- <?php /* End Main Details */ ?>
+ <?php /* Display Main Details */ ?>
+ <?php
+ $formatter = $this->recordDataFormatter();
+ $coreFields = $formatter->getData($this->driver, $formatter->getDefaults('core'));
+ ?>
+ <?php if (!empty($coreFields)): ?>
+ <table class="table table-striped">
+ <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
+ <?php foreach ($coreFields as $current): ?>
+ <tr>
+ <th><?=$this->transEsc($current['label'])?>:</th>
+ <td><?=$current['value']?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ <?php endif; ?>
+ <?php /* End Main Details */ ?>
+ </div>
+ <div class="record col-md-4">
+ <?php /* finc-specific: add toolbar to sidebar - CK */ ?>
+ <?//=$this->record($this->driver)->getToolbar()?>
+
+ <?php /* GET IT-box refs #15930 - GG */ ?>
+ <? if (count($this->tabs) > 0): ?>
+ <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+ <div class="record-tabs detailview-box-yellow">
+ <? if (count($this->tabs) > 0): ?>
+ <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+ <div class="record-tabs getitbox">
+ <ul class="recordTabs detailview-tab-nav"><? /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
+ <? foreach ($this->tabs as $tab => $obj): ?>
+ <? if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
+ <? // add current tab to breadcrumbs if applicable:
+ $desc = $obj->getDescription();
+ $tab_classes = array();
+ if (0 === strcasecmp($this->activeTab, $tab)) {
+ if (!$this->loadInitialTabWithAjax || !$obj->supportsAjax()) {
+ $tab_classes[] = 'active';
+ }
+ $tab_classes[] = 'initiallyActive';
+ $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc($desc) . '</li>';
+ $activeTabObj = $obj;
+ }
+
+ if (!$obj->isVisible()) {
+ $tab_classes[] = 'hidden';
+ }
+ //if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
+ ?>
+ <? endif; ?>
+ <? endforeach; ?>
+ </ul>
+
+ <? /* next line: we need the id - CK */ ?>
+ <div class="tabs-content detailview-content" id="record-tabs">
+ <? if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
+ <div class="content active <?=$this->activeTab?>-tab">
+ <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
+ </div>
+ <? endif; ?>
+ </div>
+ </div>
+ <? endif; ?>
+ <?php endif; ?>
+ </div>
+ </div>
</div>
<?php if (count($this->tabs) > 0): ?>
<?php foreach ($this->tabs as $tab => $obj): ?>
diff --git a/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml b/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml
index 775bafca6f4..abc96d97139 100644
--- a/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml
@@ -1,9 +1,7 @@
<!-- fid_adlr: 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">
- <?php /* finc: use VF5.1 offcanvas toggler here as well if you have a custom sidebar - CK */ ?>
- <?=$this->render('RecordDriver/DefaultRecord/offcanvas-toggler'); ?>
- <?php
+ <?php
$QRCode = $this->record($this->driver)->getQRCode("core");
$coverDetails = $this->record($this->driver)->getCoverDetails('core', 'medium', $this->record($this->driver)->getThumbnail('large'));
$cover = $coverDetails['html'];
@@ -42,70 +40,122 @@
</div>
<?php endif; ?>
<div class="media-body">
- <div class="title-toolbar">
- <div class="result-body">
- <?php /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars;
- in finc: keep schema name tag here!! #13861 - CK
- */
- ?>
- <?php /* finc: add schema tags for title #13850 - VE */ ?>
- <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3>
+ <div class="col-md-8">
+ <div class="title-toolbar">
+ <div class="result-body">
+ <?php /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars;
+ in finc: keep schema name tag here!! #13861 - CK
+ */
+ ?>
+ <?php /* finc: add schema tags for title #13850 - VE */ ?>
+ <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3>
- <?php /* fid_adlr: Remove summary refs #15650 - GG */ ?>
+ <?php /* fid_adlr: Remove summary refs #15650 - GG */ ?>
- <?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>
- <?php endif; ?>
- </div>
- <div class="result-links toolbar-details">
- <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
- <?php if ($this->permission()->allowDisplay('feature.Favorites')): ?>
- <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?>
- <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>">
- <i class="icon icon-star icon-1.5x" aria-hidden="true"></i>
- </a><br/>
- <div class="toolbar-menu">
- <a href="#" data-lightbox class="dropdown-toggle" id="toolbar-menu"
- data-toggle="dropdown" aria-controls="toolbar-menu">
- <i class="icon icon-share-2 icon-1.5x" aria-hidden="true"></i>
- </a>
- <span id="toolbar-menu" class="dropdown-menu" aria-labelledby="toolbar-menu">
- <?=$this->record($this->driver)->getToolbar()?>
- </span>
+ <?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>
+ <?php endif; ?>
+ </div>
+ <div class="result-links toolbar-details">
+ <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
+ <?php if ($this->permission()->allowDisplay('feature.Favorites')): ?>
+ <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?>
+ <div class="favorite">
+ <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>">
+ <i class="icon icon-star icon-1.5x" aria-hidden="true"></i>
+ </a>
+ </div>
+ <div class="toolbar-menu">
+ <a href="#" data-lightbox class="dropdown-toggle" id="toolbar-menu"
+ data-toggle="dropdown" aria-controls="toolbar-menu">
+ <i class="icon icon-share-2 icon-1.5x" aria-hidden="true"></i>
+ </a>
+ <span id="toolbar-menu" class="dropdown-menu" aria-labelledby="toolbar-menu">
+ <?=$this->record($this->driver)->getToolbar()?>
+ </span>
+ </div>
+ <br/>
+ <?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
+ <?=$block?>
+ <?php endif; ?>
+ <?php /* Saved lists */ ?>
+ <div class="savedLists alert alert-info hidden">
+ <strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
- <br/>
- <?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
- <?=$block?>
+ <?php endif; ?>
+ </div>
+ </div>
+
+ <?php /* Display Main Details */?>
+ <?php
+ $formatter = $this->recordDataFormatter();
+ $coreFields = $formatter->getData($driver, $formatter->getDefaults('core-ai'));
+ ?>
+ <?php if (!empty($coreFields)): ?>
+ <table class="table table-striped">
+ <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
+ <?php foreach ($coreFields as $current): ?>
+ <?php if ($current['label'] == null): ?>
+ <?=$current['value']?>
+ <?php else: ?>
+ <tr><th><?=$this->transEsc($current['label'])?>:</th><td><?=$current['value']?></td></tr>
<?php endif; ?>
- <?php /* Saved lists */ ?>
- <div class="savedLists alert alert-info hidden">
- <strong><?=$this->transEsc("Saved in")?>:</strong>
+ <?php endforeach; ?>
+ </table>
+ <?php endif; ?>
+ <?php /* End Main Details */?>
+ </div>
+ <div class="record col-md-4">
+ <?php /* finc-specific: add toolbar to sidebar - CK */ ?>
+ <?//=$this->record($this->driver)->getToolbar()?>
+
+ <?php /* GET IT-box refs #15930 - GG */ ?>
+ <? if (count($this->tabs) > 0): ?>
+ <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+ <div class="record-tabs detailview-box-yellow">
+ <? if (count($this->tabs) > 0): ?>
+ <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+ <div class="record-tabs getitbox">
+ <ul class="recordTabs detailview-tab-nav"><? /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
+ <? foreach ($this->tabs as $tab => $obj): ?>
+ <? if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
+ <? // add current tab to breadcrumbs if applicable:
+ $desc = $obj->getDescription();
+ $tab_classes = array();
+ if (0 === strcasecmp($this->activeTab, $tab)) {
+ if (!$this->loadInitialTabWithAjax || !$obj->supportsAjax()) {
+ $tab_classes[] = 'active';
+ }
+ $tab_classes[] = 'initiallyActive';
+ $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc($desc) . '</li>';
+ $activeTabObj = $obj;
+ }
+
+ if (!$obj->isVisible()) {
+ $tab_classes[] = 'hidden';
+ }
+ //if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
+ ?>
+ <? endif; ?>
+ <? endforeach; ?>
+ </ul>
+
+ <? /* next line: we need the id - CK */ ?>
+ <div class="tabs-content detailview-content" id="record-tabs">
+ <? if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
+ <div class="content active <?=$this->activeTab?>-tab">
+ <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
+ </div>
+ <? endif; ?>
</div>
- <?php endif; ?>
+ </div>
+ <? endif; ?>
+ <?php endif; ?>
</div>
</div>
-
- <?php /* Display Main Details */?>
- <?php
- $formatter = $this->recordDataFormatter();
- $coreFields = $formatter->getData($driver, $formatter->getDefaults('core-ai'));
- ?>
- <?php if (!empty($coreFields)): ?>
- <table class="table table-striped">
- <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
- <?php foreach ($coreFields as $current): ?>
- <?php if ($current['label'] == null): ?>
- <?=$current['value']?>
- <?php else: ?>
- <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 if (count($this->tabs) > 0): ?>
<?php foreach ($this->tabs as $tab => $obj): ?>
diff --git a/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml b/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml
index 76cb0e8828e..387f5e60b36 100644
--- a/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml
+++ b/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml
@@ -1,8 +1,6 @@
<!-- fid_adlr: 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">
- <?php /* finc: use VF5.1 offcanvas toggler here as well if you have a custom sidebar - CK */ ?>
- <?=$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'));
@@ -42,51 +40,54 @@
</div>
<?php endif; ?>
<div class="media-body">
- <div class="title-toolbar">
- <div class="result-body">
- <?php /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars;
- in finc: keep schema name tag here!! #13861 - CK
- */
- ?>
- <?php /* finc: add schema tags for title #13850 - VE */ ?>
- <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3>
+ <div class="col-md-8">
+ <div class="title-toolbar">
+ <div class="result-body">
+ <?php /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars;
+ in finc: keep schema name tag here!! #13861 - CK
+ */
+ ?>
+ <?php /* finc: add schema tags for title #13850 - VE */ ?>
+ <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3>
- <?php /* fid_adlr: Remove summary refs #15650 - GG */ ?>
+ <?php /* fid_adlr: Remove summary refs #15650 - GG */ ?>
- <?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>
- <?php endif; ?>
- </div>
- <div class="result-links toolbar-details">
- <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
- <?php if ($this->permission()->allowDisplay('feature.Favorites')): ?>
- <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?>
- <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>">
- <i class="icon icon-star icon-1.5x" aria-hidden="true"></i>
- </a><br/>
- <div class="toolbar-menu">
- <a href="#" data-lightbox class="dropdown-toggle" id="toolbar-menu"
- data-toggle="dropdown" aria-controls="toolbar-menu">
- <i class="icon icon-share-2 icon-1.5x" aria-hidden="true"></i>
- </a>
- <span id="toolbar-menu" class="dropdown-menu" aria-labelledby="toolbar-menu">
- <?=$this->record($this->driver)->getToolbar()?>
- </span>
+ <?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>
- <br/>
- <?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
- <?=$block?>
- <?php endif; ?>
- <?php /* Saved lists */ ?>
- <div class="savedLists alert alert-info hidden">
- <strong><?=$this->transEsc("Saved in")?>:</strong>
- </div>
- <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <div class="result-links toolbar-details">
+ <?php if ($this->userlist()->getMode() !== 'disabled'): ?>
+ <?php if ($this->permission()->allowDisplay('feature.Favorites')): ?>
+ <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?>
+ <div class="favorite">
+ <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>">
+ <i class="icon icon-star icon-1.5x" aria-hidden="true"></i>
+ </a>
+ </div>
+ <div class="toolbar-menu">
+ <a href="#" data-lightbox class="dropdown-toggle" id="toolbar-menu"
+ data-toggle="dropdown" aria-controls="toolbar-menu">
+ <i class="icon icon-share-2 icon-1.5x" aria-hidden="true"></i>
+ </a>
+ <span id="toolbar-menu" class="dropdown-menu" aria-labelledby="toolbar-menu">
+ <?=$this->record($this->driver)->getToolbar()?>
+ </span>
+ </div>
+ <br/>
+ <?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
+ <?=$block?>
+ <?php endif; ?>
+ <?php /* Saved lists */ ?>
+ <div class="savedLists alert alert-info hidden">
+ <strong><?=$this->transEsc("Saved in")?>:</strong>
+ </div>
+ <?php endif; ?>
+ </div>
</div>
- </div>
<?php /* Display Main Details */?>
<?php
@@ -110,6 +111,56 @@
<?php endif; ?>
<?php /* End Main Details */?>
</div>
+ <div class="record col-md-4">
+ <?php /* finc-specific: add toolbar to sidebar - CK */ ?>
+ <?//=$this->record($this->driver)->getToolbar()?>
+
+ <?php /* GET IT-box refs #15930 - GG */ ?>
+ <? if (count($this->tabs) > 0): ?>
+ <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+ <div class="record-tabs detailview-box-yellow">
+ <? if (count($this->tabs) > 0): ?>
+ <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
+ <div class="record-tabs getitbox">
+ <ul class="recordTabs detailview-tab-nav"><? /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
+ <? foreach ($this->tabs as $tab => $obj): ?>
+ <? if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
+ <? // add current tab to breadcrumbs if applicable:
+ $desc = $obj->getDescription();
+ $tab_classes = array();
+ if (0 === strcasecmp($this->activeTab, $tab)) {
+ if (!$this->loadInitialTabWithAjax || !$obj->supportsAjax()) {
+ $tab_classes[] = 'active';
+ }
+ $tab_classes[] = 'initiallyActive';
+ $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc($desc) . '</li>';
+ $activeTabObj = $obj;
+ }
+
+ if (!$obj->isVisible()) {
+ $tab_classes[] = 'hidden';
+ }
+ //if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
+ ?>
+ <? endif; ?>
+ <? endforeach; ?>
+ </ul>
+
+ <? /* next line: we need the id - CK */ ?>
+ <div class="tabs-content detailview-content" id="record-tabs">
+ <? if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
+ <div class="content active <?=$this->activeTab?>-tab">
+ <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
+ </div>
+ <? endif; ?>
+ </div>
+ </div>
+ <? endif; ?>
+ <?php endif; ?>
+ </div>
+ </div>
+ </div>
+
<?php if (count($this->tabs) > 0): ?>
<?php foreach ($this->tabs as $tab => $obj): ?>
<?php if (!in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
diff --git a/themes/fid_adlr/templates/RecordTab/acquisitionpda.phtml b/themes/fid_adlr/templates/RecordTab/acquisitionpda.phtml
index 528fa3856a8..a48a021c213 100644
--- a/themes/fid_adlr/templates/RecordTab/acquisitionpda.phtml
+++ b/themes/fid_adlr/templates/RecordTab/acquisitionpda.phtml
@@ -40,7 +40,7 @@ $this->headTitle($this->driver->getBreadcrumb());
<?=($offlineMode == "ils-offline") ? $this->render('Helpers/ils-offline.phtml', ['offlineModeMsg' => 'ils_offline_holdings_message']) : ''?>
<?php if ($user): ?>
- <a class="btn btn-primary pda-button <?=$controllerClass?>" data-lightbox href="<?=$this->url('record-pda', array('id' => $id))?>" rel="nofollow">
+ <a class="btn btn-primary pda-button <?=$controllerClass?> full-order" data-lightbox href="<?=$this->url('record-pda', array('id' => $id))?>" rel="nofollow">
<?=$this->transEsc('getit_order')?>
</a>
<?php endif; ?>
@@ -48,7 +48,7 @@ $this->headTitle($this->driver->getBreadcrumb());
<?php /* finc: add 'Online Access' in holdings-tab #13770 - VE */ ?>
<?php if (!empty($urls) || $openUrlActive || $doiActive): ?>
<?php if ($getit->showLinks() && (!empty($urls) || $openUrlActive || $doiActive)): ?>
- <?= $this->context($this)->renderInContext('get-it-box/side-panel-links.phtml', [
+ <?= $this->context($this)->renderInContext('get-it-box/links.phtml', [
'getit' => $getit,
'openUrl' => $openUrl,
'openUrlActive' => $openUrlActive,
diff --git a/themes/fid_adlr/templates/RecordTab/holdingsils.phtml b/themes/fid_adlr/templates/RecordTab/holdingsils.phtml
index 8a51dde9b01..849c460ae3c 100644
--- a/themes/fid_adlr/templates/RecordTab/holdingsils.phtml
+++ b/themes/fid_adlr/templates/RecordTab/holdingsils.phtml
@@ -40,21 +40,23 @@
<?=($offlineMode == "ils-offline") ? $this->render('Helpers/ils-offline.phtml', ['offlineModeMsg' => 'ils_offline_holdings_message']) : ''?>
<?php if ($getit->showOrderButton() && $user): ?>
- <a class="btn btn-primary pda-button" data-lightbox href="<?=$this->url('record-pda', array('id' => $id))?>" rel="nofollow">
+ <a class="btn btn-primary pda-button full-order" data-lightbox href="<?=$this->url('record-pda', array('id' => $id))?>" rel="nofollow">
<?=$this->transEsc('getit_order')?>
</a>
<?php endif; ?>
<?php if ($getit->showPartCopyButton() && $user): ?>
- <a class="btn btn-primary pda-button" data-lightbox href="<?=$this->url('record-pda', array('id' => $id))?>" rel="nofollow">
+ <a class="btn btn-primary pda-button part-order" data-lightbox href="<?=$this->url('record-pda', array('id' => $id))?>" rel="nofollow">
<?=$this->transEsc('getit_partcopy')?>
</a><br />
+ <div class="pda-part-text">
<?=$this->transEsc('getit_partcopy_notice')?>
+ </div>
<?php endif; ?>
<?php /* finc: add 'Online Access' in holdings-tab #13770 - VE */ ?>
<?php if ($getit->showLinks() && (!empty($urls) || $openUrlActive || $doiActive)): ?>
- <?= $this->context($this)->renderInContext('get-it-box/side-panel-links.phtml', [
+ <?= $this->context($this)->renderInContext('get-it-box/links.phtml', [
'getit' => $getit,
'openUrl' => $openUrl,
'openUrlActive' => $openUrlActive,
diff --git a/themes/fid_adlr/templates/get-it-box/side-panel-links.phtml b/themes/fid_adlr/templates/get-it-box/links.phtml
similarity index 90%
rename from themes/fid_adlr/templates/get-it-box/side-panel-links.phtml
rename to themes/fid_adlr/templates/get-it-box/links.phtml
index 5f91c2d62fc..b4818893d6a 100644
--- a/themes/fid_adlr/templates/get-it-box/side-panel-links.phtml
+++ b/themes/fid_adlr/templates/get-it-box/links.phtml
@@ -1,5 +1,5 @@
-<!-- fid_adlr: get-it-box - side-panel-links -->
-<div class="facet-group" id="side-panel-links-<?= $getit->getAccordeonColor() ?>">
+<!-- fid_adlr: get-it-box - links -->
+<div class="facet-group" id="get-it-links-<?= $getit->getAccordeonColor() ?>">
<button class="title collapsed" id="get-it-button" data-toggle="collapse" href="#side-collapse-links-data">
<?= $getit->getAccordeonHeadline() ?>
</button>
@@ -43,4 +43,4 @@ JS;
?>
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $closeAccordeonOnMobile, 'SET');?>
-<!-- fid_adlr: get-it-box - side-panel-links - END -->
\ No newline at end of file
+<!-- fid_adlr: get-it-box - links - END -->
\ No newline at end of file
diff --git a/themes/fid_adlr/templates/record/view.phtml b/themes/fid_adlr/templates/record/view.phtml
index ec3ef6650f6..bde5f9e3857 100644
--- a/themes/fid_adlr/templates/record/view.phtml
+++ b/themes/fid_adlr/templates/record/view.phtml
@@ -36,8 +36,6 @@ $this->layout()->title = $this->driver->getShortTitle();
<?=$this->flashmessages()?>
<?=$this->record($this->driver)->getCoreMetadata()?>
- <?php /* fid_adlr: remove tabs refs #15650 - GG */ ?>
-
<?php
$link = '<i class="icon icon-arrow-left icon-1.5x" aria-hidden="true"></i> ' . $this->transEsc('go_to_list');
?>
@@ -46,59 +44,5 @@ $this->layout()->title = $this->driver->getShortTitle();
<?=$this->driver->supportsCoinsOpenURL() ? '<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>' : ''?>
</div>
-
- <div class="<?=$this->layoutClass('sidebar')?> record">
- <?php /* finc-specific: add toolbar to sidebar - CK */ ?>
- <?//=$this->record($this->driver)->getToolbar()?>
-
- <?php /* GET IT-box refs #15930 - GG */ ?>
- <? if (count($this->tabs) > 0): ?>
- <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
- <div class="record-tabs detailview-box-yellow">
- <? if (count($this->tabs) > 0): ?>
- <a name="tabnavi"></a><? /* Renamed, no typo, to render jump to tab ineffective */ ?>
- <div class="record-tabs getitbox">
- <ul class="recordTabs detailview-tab-nav"><? /* DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
- <? foreach ($this->tabs as $tab => $obj): ?>
- <? if (in_array($tab, ['Holdings', 'AcquisitionPDA'])): ?>
- <? // add current tab to breadcrumbs if applicable:
- $desc = $obj->getDescription();
- $tab_classes = array();
- if (0 === strcasecmp($this->activeTab, $tab)) {
- if (!$this->loadInitialTabWithAjax || !$obj->supportsAjax()) {
- $tab_classes[] = 'active';
- }
- $tab_classes[] = 'initiallyActive';
- $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc($desc) . '</li>';
- $activeTabObj = $obj;
- }
-
- if (!$obj->isVisible()) {
- $tab_classes[] = 'hidden';
- }
- //if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
- ?>
- <? endif; ?>
- <? endforeach; ?>
- </ul>
-
- <? /* next line: we need the id - CK */ ?>
- <div class="tabs-content detailview-content" id="record-tabs">
- <? if (!$this->loadInitialTabWithAjax || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
- <div class="content active <?=$this->activeTab?>-tab">
- <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
- </div>
- <? endif; ?>
- </div>
- </div>
- <? endif; ?>
- <?php endif; ?>
-
- <?php foreach ($sidebarList as $current): ?>
- <?=$this->related()->render($current)?>
- <?php endforeach; ?>
- </div>
- </div>
-
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(recordDocReady);', 'SET');?>
<!-- fid_adlr: record - view - END -->
--
GitLab