From 5dd0f4810f5b1ab313a6749cb56287df50b2aefe Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Tue, 25 Jun 2019 13:54:22 +0200
Subject: [PATCH] refs #15418 [fid_bbi] styling result list
* styling of favorite and cart buttons
* alignment in result list
** aligns mega_collection to the right
** avoids line breaks
* change color for pinned element
* favorite stars in AI result list
* removes Favorites list overview
* removes AjaxStatus
---
module/fid_bbi/src/fid_bbi/RecordDriver/Factory.php | 5 -----
themes/fid_bbi/js/check_save_statuses.js | 2 +-
themes/fid_bbi/scss/_customVariables.scss | 3 +++
themes/fid_bbi/scss/compiled.scss | 11 +++++++++++
.../RecordDriver/DefaultRecord/result-list.phtml | 6 +++---
.../templates/RecordDriver/SolrAI/result-list.phtml | 6 +++---
themes/fid_bbi/templates/record/cart-buttons.phtml | 4 ++--
7 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/module/fid_bbi/src/fid_bbi/RecordDriver/Factory.php b/module/fid_bbi/src/fid_bbi/RecordDriver/Factory.php
index 92d39cf94f9..c27e9b041a9 100644
--- a/module/fid_bbi/src/fid_bbi/RecordDriver/Factory.php
+++ b/module/fid_bbi/src/fid_bbi/RecordDriver/Factory.php
@@ -56,11 +56,6 @@ class Factory
null,
$container->get('VuFind\Config')->get('searches')
);
- $driver->attachILS(
- $container->get('VuFind\ILSConnection'),
- $container->get('VuFind\ILSHoldLogic'),
- $container->get('VuFind\ILSTitleHoldLogic')
- );
$driver->attachSearchService($container->get('VuFind\Search'));
return $driver;
}
diff --git a/themes/fid_bbi/js/check_save_statuses.js b/themes/fid_bbi/js/check_save_statuses.js
index 856b8f98515..e1f93295ce4 100644
--- a/themes/fid_bbi/js/check_save_statuses.js
+++ b/themes/fid_bbi/js/check_save_statuses.js
@@ -9,7 +9,7 @@ function displaySaveStatus(itemLists, $item) {
}).join('') + '</ul>';
// favorites icon toggle - GG
var id = $item.find('.hiddenId').val();
- $item.find('#fav-icon'+id).removeClass('fa-star-o').addClass('fa-star');
+ $item.find('#fav-icon'+id).addClass('in-list');
$item.find('.savedLists').addClass('loaded');
$item.find('.js-load').replaceWith(html);
} else {
diff --git a/themes/fid_bbi/scss/_customVariables.scss b/themes/fid_bbi/scss/_customVariables.scss
index 6ba0df356d3..98d951795a9 100644
--- a/themes/fid_bbi/scss/_customVariables.scss
+++ b/themes/fid_bbi/scss/_customVariables.scss
@@ -2,6 +2,7 @@
$brand-primary: #035151 !default;
$brand-primary-light: #b3caca !default;
$brand-secondary: #8a151a !default;
+$brand-secondary-light: #BF1D24 !default;
$brand-danger: #f04124 !default;
$brand-info: #008cba !default;
$brand-success: #43ac6a !default;
@@ -11,3 +12,5 @@ $alert-warning-bg: #d3d3d3 !default;
$component-active-bg: $brand-primary-light !default;
$snow: $brand-primary-light !default;
+
+$in-list-or-bookbag: $brand-secondary-light !default
\ No newline at end of file
diff --git a/themes/fid_bbi/scss/compiled.scss b/themes/fid_bbi/scss/compiled.scss
index e5919c80c04..d47444b8936 100644
--- a/themes/fid_bbi/scss/compiled.scss
+++ b/themes/fid_bbi/scss/compiled.scss
@@ -294,6 +294,10 @@ input.searchFormKeepFilters {
text-align: left;
}
+.save-record .in-list {
+ color: $in-list-or-bookbag;
+}
+
//// Bookbag Icons
.cart-link-icon.fa {
margin-right: 0;
@@ -302,6 +306,10 @@ input.searchFormKeepFilters {
.template-name-results & {
font-size: 2em;
}
+
+ &.in-bookbag {
+ color: $in-list-or-bookbag;
+ }
}
//// Bookbag Labels - hide in result list
@@ -312,6 +320,9 @@ input.searchFormKeepFilters {
//// Collection Info (in new location)
.collection-details {
text-align: right;
+ display: inline-block;
+ float: right;
+ margin-right: 0.5em;
}
// MyRESEARCH / Account
diff --git a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/result-list.phtml b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/result-list.phtml
index f6af201e907..d5826111765 100644
--- a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/result-list.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/result-list.phtml
@@ -165,15 +165,15 @@ $i = 0;
<?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 id="fav-icon<?=$this->driver->getUniqueId()?>" class="fa fa-fw fa-star-o fa-2x" aria-hidden="true"></i> <span class="sr-only"><?=$this->transEsc('Add to favorites')?></span>
+ <i id="fav-icon<?=$this->driver->getUniqueId()?>" class="fa fa-fw fa-star fa-2x" aria-hidden="true"></i> <span class="sr-only"><?=$this->transEsc('Add to favorites')?></span>
</a><br/>
<?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
<?=$block?>
<?php endif; ?>
- <?php /* Saved lists */ ?>
+ <?php /*Saved lists ?>
<div class="savedLists alert alert-info hidden">
<strong><?=$this->transEsc("Saved in")?>:</strong>
- </div>
+ </div>*/?>
<?php endif; ?>
<?php /* Hierarchy tree link; finc: keep Icon inside link - CK */ ?>
diff --git a/themes/fid_bbi/templates/RecordDriver/SolrAI/result-list.phtml b/themes/fid_bbi/templates/RecordDriver/SolrAI/result-list.phtml
index 45265d6dcf5..9f278d98d33 100644
--- a/themes/fid_bbi/templates/RecordDriver/SolrAI/result-list.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/SolrAI/result-list.phtml
@@ -226,16 +226,16 @@ if ($cover):
<?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="result-link-icon fa fa-fw fa-star-o fa-2x" aria-hidden="true"></i> <span class="sr-only"> <?=$this->transEsc('Add to favorites')?></span>
+ <i class="result-link-icon fa fa-fw fa-star fa-2x" aria-hidden="true"></i> <span class="sr-only"> <?=$this->transEsc('Add to favorites')?></span>
</a><br/>
<?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
<?=$block?>
<?php endif; ?>
- <?php /* Saved lists */ ?>
+ <?php /* Saved lists ?>
<div class="savedLists alert alert-info hidden">
<strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
- <?php /* endif; */ ?>
+ <?php endif; */ ?>
<?php /* Hierarchy tree link; finc: keep Icon inside link - CK */ ?>
<?php $trees = $this->driver->tryMethod('getHierarchyTrees');
diff --git a/themes/fid_bbi/templates/record/cart-buttons.phtml b/themes/fid_bbi/templates/record/cart-buttons.phtml
index 54cdd8f7dec..6fb77eef701 100644
--- a/themes/fid_bbi/templates/record/cart-buttons.phtml
+++ b/themes/fid_bbi/templates/record/cart-buttons.phtml
@@ -5,10 +5,10 @@
<?php $cartId = $this->source . '|' . $this->id; ?>
<span class="btn-bookbag-toggle" data-cart-id="<?=$this->escapeHtmlAttr($this->id)?>" data-cart-source="<?=$this->escapeHtmlAttr($this->source)?>">
<a class="cart-add hidden<?php if (!$cart->contains($cartId)): ?> correct<?php endif ?>">
- <i class="cart-link-icon fa fa-plus" aria-hidden="true" title="<?=$this->transEsc('Add to Book Bag')?>"></i><span class="cart-link-label"><?=$this->transEsc('Add to Book Bag')?></span>
+ <i class="cart-link-icon fa fa-thumb-tack" aria-hidden="true" title="<?=$this->transEsc('Add to Book Bag')?>"></i><span class="cart-link-label"><?=$this->transEsc('Add to Book Bag')?></span>
</a>
<a class="cart-remove hidden<?php if ($cart->contains($cartId)): ?> correct<?php endif ?>">
- <i class="cart-link-icon fa fa-minus-circle" aria-hidden="true" title="<?=$this->transEsc('Remove from Book Bag')?>"></i> <span class="cart-link-label"><?=$this->transEsc('Remove from Book Bag')?></span>
+ <i class="cart-link-icon fa fa-thumb-tack in-bookbag" aria-hidden="true" title="<?=$this->transEsc('Remove from Book Bag')?>"></i> <span class="cart-link-label"><?=$this->transEsc('Remove from Book Bag')?></span>
</a>
<noscript>
<form method="post" name="addForm" action="<?=$this->url('cart-processor')?>">
--
GitLab