diff --git a/Gruntfile.js b/Gruntfile.js
index e0ca99043be53f33a8f7b2f8892d21e360fd4d52..4e6e7c38cc4f14aefa1791010ad00fa52a102ba6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -74,6 +74,7 @@ module.exports = function(grunt) {
}
}
},
+
// Convert LESS to SASS, mostly for development team use
lessToSass: {
convert: {
@@ -102,65 +103,64 @@ module.exports = function(grunt) {
],
options: {
replacements: [
- { // Replace ; in include with ,
- pattern: /(\s+)@include ([^\(]+)\(([^\)]+)\);/gi,
- replacement: function mixinCommas(match, space, $1, $2) {
- return space + '@include ' + $1 + '(' + $2.replace(/;/g, ',') + ');';
+ // Activate SCSS
+ {
+ pattern: /\/\* #SCSS>/gi,
+ replacement: "/* #SCSS> */",
+ order: -1 // Do before anything else
+ },
+ {
+ pattern: /<#SCSS \*\//gi,
+ replacement: "/* <#SCSS */",
+ order: -1
+ },
+ // Deactivate LESS
+ {
+ pattern: /\/\* #LESS> \*\//gi,
+ replacement: "/* #LESS>",
+ order: -1
+ },
+ {
+ pattern: /\/\* <#LESS \*\//gi,
+ replacement: "<#LESS */",
+ order: -1
+ },
+ { // Change separator in @include statements
+ pattern: /@include ([^\(]+)\(([^\)]+)\);/gi,
+ replacement: function mixinCommas(match, $1, $2) {
+ return '@include ' + $1 + '(' + $2.replace(/;/g, ',') + ');';
},
- order: 3
+ order: 4 // after defaults included in less-to-sass
},
{ // Remove unquote
- pattern: /(\s+)unquote\("([^"]+)"\)/gi,
- replacement: function mixinCommas(match, space, $1) {
- return space + $1;
+ pattern: /unquote\("([^"]+)"\)/gi,
+ replacement: function ununquote(match, $1) {
+ return $1;
},
- order: 3
+ order: 4
},
{ // Inline &:extends converted
pattern: /&:extend\(([^\)]+)\)/gi,
replacement: '@extend $1',
- order: 3
- },
- { // Inline variables not default
- pattern: / !default; }/gi,
- replacement: '; }',
- order: 3
- },
- { // VuFind: Correct paths
- pattern: 'vendor/bootstrap/bootstrap',
- replacement: 'vendor/bootstrap',
order: 4
},
- {
- pattern: '$fa-font-path: "../../../fonts" !default;\n',
- replacement: '',
- order: 4
- },
- {
- pattern: '@import "vendor/font-awesome/font-awesome";',
- replacement: '$fa-font-path: ' + fontAwesomePath + ';\n@import "vendor/font-awesome/font-awesome";',
- order: 4
- },
- { // VuFind: Bootprint fixes
- pattern: '@import "bootstrap";\n@import "variables";',
- replacement: '@import "variables", "bootstrap";',
- order: 4
- },
- {
- pattern: '$brand-primary: #619144 !default;',
- replacement: '$brand-primary: #619144;',
+ { // Wrap variables in calcs with #{}
+ pattern: /calc\([^;]+/gi,
+ replacement: function calcVariables(match) {
+ return match.replace(/(\$[^ ]+)/gi, '#{$1}');
+ },
order: 4
},
- // Wrap calcs in {}
- {
- pattern: /calc\((\$[^ ]+)/g,
- replacement: 'calc(#{$1}',
+ { // Remove !default from extends (icons.scss)
+ pattern: /@extend ([^;}]+) !default;/gi,
+ replacement: '@extend $1;',
order: 5
- },
+ }
]
}
}
},
+
watch: {
options: {
atBegin: true
diff --git a/build.xml b/build.xml
index 2555af944b350e95f714b3ea2655622a73e7c5a7..cc8e25a306d40c133edf8d53529236df00370ee4 100644
--- a/build.xml
+++ b/build.xml
@@ -28,7 +28,7 @@
<property name="solr_version" value="7.3.1" />
<property name="phpdoc_version" value="2.9.0" />
- <property name="version" value="5.1" />
+ <property name="version" value="5.1.1" />
<!-- We only need the -p switch if the password is non-blank -->
<if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then>
diff --git a/config/vufind/Folio.ini b/config/vufind/Folio.ini
index 94dadbd80867a68b97d248d48ecff1e45945cb24..c11cce00f83b3bfb510a9114cec490d078774432 100644
--- a/config/vufind/Folio.ini
+++ b/config/vufind/Folio.ini
@@ -1,4 +1,5 @@
-[Folio]
+[API]
base_url = https://localhost:9130
username = diku_admin
password = admin
+tenant = diku
diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index 32294490505fdd77754b3401b49744105e671dd9..08faaf8aec16bbddf169202824d44f44aff31ca9 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -145,7 +145,7 @@ allowSavedSearches = true
; features (such as display of hierarchies).
nonJavascriptSupportEnabled = false
; Generator value to display in an HTML header <meta> tag:
-generator = "VuFind 5.1.0"
+generator = "VuFind 5.1.1"
; This section allows you to configure the mechanism used for storing user
; sessions. Available types: File, Memcache, Database.
diff --git a/import/index_java/src/org/vufind/index/FullTextTools.java b/import/index_java/src/org/vufind/index/FullTextTools.java
index 0ab0bb3c7198cd465d1b158290154ca868f148c3..3e11eade3d9c70f18f70b082c38b32ea17873797 100644
--- a/import/index_java/src/org/vufind/index/FullTextTools.java
+++ b/import/index_java/src/org/vufind/index/FullTextTools.java
@@ -206,7 +206,7 @@ public class FullTextTools
//System.out.println("Loading fulltext from " + url + ". Please wait ...");
try {
Process p = Runtime.getRuntime().exec(cmd);
-
+
// Debugging output
/*
BufferedReader stdInput = new BufferedReader(new
@@ -216,7 +216,7 @@ public class FullTextTools
System.out.println(s);
}
*/
-
+
// Wait for Aperture to finish
p.waitFor();
} catch (Throwable e) {
@@ -248,6 +248,28 @@ public class FullTextTools
return plainText;
}
+ class ErrorStreamHandler extends Thread {
+ InputStream stdErr;
+
+ ErrorStreamHandler(InputStream stdErr) {
+ this.stdErr = stdErr;
+ }
+
+ public void run()
+ {
+ try {
+ InputStreamReader isr = new InputStreamReader(stdErr, "UTF8");
+ BufferedReader br = new BufferedReader(isr);
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ logger.debug(line);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
/**
* Harvest the contents of a document file (PDF, Word, etc.) using Tika.
* This method will only work if Tika is properly configured in the fulltext.ini
@@ -258,16 +280,17 @@ public class FullTextTools
* @return the full-text
*/
public String harvestWithTika(String url, String scraperPath) {
-
- // Construct the command
- String cmd = "java -jar " + scraperPath + " -t -eUTF8 " + url;
-
StringBuilder stringBuilder= new StringBuilder();
// Call our scraper
//System.out.println("Loading fulltext from " + url + ". Please wait ...");
try {
- Process p = Runtime.getRuntime().exec(cmd);
+ ProcessBuilder pb = new ProcessBuilder(
+ "java", "-jar", scraperPath, "-t", "-eutf8", url
+ );
+ Process p = pb.start();
+ ErrorStreamHandler esh = new ErrorStreamHandler(p.getErrorStream());
+ esh.start();
BufferedReader stdInput = new BufferedReader(new
InputStreamReader(p.getInputStream(), "UTF8"));
diff --git a/languages/cs.ini b/languages/cs.ini
index ce1a8ac75f01fa9d6ae10aec9ee7188f8a14f09c..9070c0fa8f97c605c88b8970fa0deaa88adefac9 100644
--- a/languages/cs.ini
+++ b/languages/cs.ini
@@ -1,4 +1,4 @@
-; Translation: opensource.knihovna.cz, Michal Denár, Josef Moravec, last updated 7. 1. 2019
+; Translation: opensource.knihovna.cz, Michal Denár, Josef Moravec, last updated 13. 4. 2019
Abstract = "Abstrakt"
Access = "PÅ™Ãstup"
Access URL = "PÅ™Ãstupová URL adresa"
@@ -951,7 +951,7 @@ sort_author = "Autor"
sort_author_author = "AbecednÄ›"
sort_author_relevance = "OblÃbenost"
sort_callnumber = "Signatury"
-sort_checkout_date_asc = "Data vypůjÄená vzestupnÄ›"
+sort_checkout_date_asc = "Data vypůjÄenà vzestupnÄ›"
sort_checkout_date_desc = "Data vypůjÄenà sestupnÄ›"
sort_count = "PoÄet výsledků"
sort_due_date_asc = "TermÃnu pro vrácenà vzestupnÄ›"
diff --git a/languages/de.ini b/languages/de.ini
index 65c20885ca2e0c0498a279062349acb22bec1b07..08c7861784d4d73da7a6f07f0a3d6ffa113cde98 100644
--- a/languages/de.ini
+++ b/languages/de.ini
@@ -752,8 +752,8 @@ Password Again = "Passwort wiederholen"
Password cannot be blank = "Das Passwort darf nicht leer sein"
password_error_invalid = "Ungültiges neues Passwort (enthält z.B. ungültige Zeichen)"
password_error_not_unique = "Das Passwort wurde nicht geändert"
-password_maximum_length = "Die maximale Länge des Passowrts beträgt %%maxlength%% Zeichen"
-password_minimum_length = "Die minimale Länge des Passowrts beträgt %%minlength%% Zeichen"
+password_maximum_length = "Die maximale Länge des Passworts beträgt %%maxlength%% Zeichen"
+password_minimum_length = "Die minimale Länge des Passworts beträgt %%minlength%% Zeichen"
password_only_alphanumeric = "Nur Zahlen und Buchstaben A-Z"
password_only_numeric = "Nur Zahlen"
Passwords do not match = "Die Passwörter stimmen nicht überein"
diff --git a/module/VuFind/src/VuFind/AjaxHandler/AbstractUserRequestAction.php b/module/VuFind/src/VuFind/AjaxHandler/AbstractUserRequestAction.php
index 8928f5bef48d813d705c9fe51276c32f133ac0ec..bbeec5783b730ff1bbe1660e2742bc212410b78a 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/AbstractUserRequestAction.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/AbstractUserRequestAction.php
@@ -59,10 +59,10 @@ abstract class AbstractUserRequestAction extends AbstractIlsAndUserAction
$this->disableSessionWrites(); // avoid session write timing bug
$patron = $this->ilsAuthenticator->storedCatalogLogin();
if (!$patron) {
- return $this->formatResponse('', self::STATUS_NEED_AUTH, 401);
+ return $this->formatResponse('', self::STATUS_HTTP_NEED_AUTH, 401);
}
if (!$this->ils->checkCapability($this->lookupMethod)) {
- return $this->formatResponse('', self::STATUS_ERROR, 405);
+ return $this->formatResponse('', self::STATUS_HTTP_ERROR, 405);
}
$requests = $this->ils->{$this->lookupMethod}($patron);
$status = [
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetUserFines.php b/module/VuFind/src/VuFind/AjaxHandler/GetUserFines.php
index 37af9326d0debb75818c550bae2f32861c5957d0..8355f978cef697502e99e1693a5dcde4fac72dfe 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetUserFines.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetUserFines.php
@@ -73,10 +73,10 @@ class GetUserFines extends AbstractIlsAndUserAction
$this->disableSessionWrites(); // avoid session write timing bug
$patron = $this->ilsAuthenticator->storedCatalogLogin();
if (!$patron) {
- return $this->formatResponse('', self::STATUS_NEED_AUTH, 401);
+ return $this->formatResponse('', self::STATUS_HTTP_NEED_AUTH, 401);
}
if (!$this->ils->checkCapability('getMyFines')) {
- return $this->formatResponse('', self::STATUS_ERROR, 405);
+ return $this->formatResponse('', self::STATUS_HTTP_ERROR, 405);
}
$sum = 0;
foreach ($this->ils->getMyFines($patron) as $fine) {
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetUserTransactions.php b/module/VuFind/src/VuFind/AjaxHandler/GetUserTransactions.php
index 94ceb988c943a3aa90610cf7d82e514d0a078985..181d2e8c3c38ea786aff6e621a5f770cc7994490 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetUserTransactions.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetUserTransactions.php
@@ -52,10 +52,10 @@ class GetUserTransactions extends AbstractIlsAndUserAction
$this->disableSessionWrites(); // avoid session write timing bug
$patron = $this->ilsAuthenticator->storedCatalogLogin();
if (!$patron) {
- return $this->formatResponse('', self::STATUS_NEED_AUTH, 401);
+ return $this->formatResponse('', self::STATUS_HTTP_NEED_AUTH, 401);
}
if (!$this->ils->checkCapability('getMyTransactions')) {
- return $this->formatResponse('', self::STATUS_ERROR, 405);
+ return $this->formatResponse('', self::STATUS_HTTP_ERROR, 405);
}
$items = $this->ils->getMyTransactions($patron);
$counts = [
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index faa08158a0b47aef8e837d69ab16e786cc4bcbbe..1b617ab1c69c9886a5ecbc5c7a4205aa78af6c56 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -321,6 +321,7 @@ class AbstractBase extends AbstractActionController
// Now check if the user has provided credentials with which to log in:
$ilsAuth = $this->getILSAuthenticator();
+ $patron = null;
if (($username = $this->params()->fromPost('cat_username', false))
&& ($password = $this->params()->fromPost('cat_password', false))
) {
diff --git a/module/VuFind/src/VuFind/Controller/LibraryCardsController.php b/module/VuFind/src/VuFind/Controller/LibraryCardsController.php
index 909c51aa604964690fe1ab89bb7c6d7d3b7728c4..dbc47d66067bc6bc0d92b5aa016f9a8066f914e7 100644
--- a/module/VuFind/src/VuFind/Controller/LibraryCardsController.php
+++ b/module/VuFind/src/VuFind/Controller/LibraryCardsController.php
@@ -178,6 +178,21 @@ class LibraryCardsController extends AbstractBase
);
}
+ /**
+ * When redirecting after selecting a library card, adjust the URL to make
+ * sure it will work correctly.
+ *
+ * @param string $url URL to adjust
+ *
+ * @return string
+ */
+ protected function adjustCardRedirectUrl($url)
+ {
+ // If there is pagination in the URL, reset it to page 1, since the
+ // new card may have a different number of pages of data:
+ return preg_replace('/([&?]page)=[0-9]+/', '$1=1', $url);
+ }
+
/**
* Activates a library card
*
@@ -215,7 +230,7 @@ class LibraryCardsController extends AbstractBase
$this->setFollowupUrlToReferer();
if ($url = $this->getFollowupUrl()) {
$this->clearFollowupUrl();
- return $this->redirect()->toUrl($url);
+ return $this->redirect()->toUrl($this->adjustCardRedirectUrl($url));
}
return $this->redirect()->toRoute('myresearch-home');
}
diff --git a/module/VuFind/src/VuFind/Search/UrlQueryHelper.php b/module/VuFind/src/VuFind/Search/UrlQueryHelper.php
index 61e2e0500169afe1cfb3ccd7a8d2602845e7be6f..0f9f7c0bca0ea8b18ed03f04b2cd3ec8b05b69c2 100644
--- a/module/VuFind/src/VuFind/Search/UrlQueryHelper.php
+++ b/module/VuFind/src/VuFind/Search/UrlQueryHelper.php
@@ -144,6 +144,17 @@ class UrlQueryHelper
$this->urlParams['lookfor' . $i][] = $inner->getString();
$this->urlParams['type' . $i][] = $inner->getHandler();
if (null !== ($op = $inner->getOperator())) {
+ // We want the op and lookfor parameters to align
+ // with each other; let's backfill empty op values
+ // if there aren't enough in place already.
+ $expectedOps
+ = count($this->urlParams['lookfor' . $i]) - 1;
+ while (
+ count($this->urlParams['op' . $i] ?? [])
+ < $expectedOps
+ ) {
+ $this->urlParams['op' . $i][] = '';
+ }
$this->urlParams['op' . $i][] = $op;
}
}
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/JumpToRecordTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/JumpToRecordTest.php
index 7f54a2fc1bf9729752345612e08b0dc142f92719..1b8c54336e5c73afed237c37be6c3db544679a9e 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/JumpToRecordTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/JumpToRecordTest.php
@@ -53,7 +53,7 @@ class JumpToRecordTest extends \VuFindTest\Unit\MinkTestCase
$this->assertEquals(
'La congiura dei Principi Napoletani 1701 : (prima e seconda stesura) /',
- trim($this->findCss($page, 'h3')->getText())
+ trim($this->findCss($page, 'h1')->getText())
);
}
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/NextPrevNavTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/NextPrevNavTest.php
index d8004889a0d98619b642889c642387b39fd92a5b..7eb106e97af4eef4ecb46da0467777fba498e959 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/NextPrevNavTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/NextPrevNavTest.php
@@ -62,6 +62,6 @@ class NextPrevNavTest extends \VuFindTest\Unit\MinkTestCase
$session->visit($this->getVuFindUrl() . "/Record/geo20001");
// should fail if exception is thrown
- $this->assertContains("Test Publication 20001", $this->findCss($page, "div.media-body > h3[property=name]")->getText());
+ $this->assertContains("Test Publication 20001", $this->findCss($page, "div.media-body > h1[property=name]")->getText());
}
}
diff --git a/package.json b/package.json
index ca4eee3e4099869b0a918a5b476d5886073e4a4f..f427f8ac88d5244aa55811f2395e3e207526e647 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vufind",
- "version": "5.1.0",
+ "version": "5.1.1",
"description": "Dev tools to handle css preprocessing, js magic, and compression",
"repository": {
"type": "git",
@@ -12,10 +12,11 @@
"dependencies": {
"grunt": "^1.0.0",
"grunt-cli": "^1.2.0",
- "grunt-sass": "^1.0.0",
"grunt-contrib-less": "1.3.0",
"grunt-less-to-sass": "0.0.10",
- "jit-grunt": "^0.9.1"
+ "grunt-sass": "^1.0.0",
+ "jit-grunt": "^0.9.1",
+ "node-sass": "^4.11.0"
},
"devDependencies": {
"grunt-contrib-watch": "~0.6.1"
diff --git a/packages/DEBIAN/changelog b/packages/DEBIAN/changelog
index 830490f71a21c0338331f644f4e83db18851020e..919258e8921d7dc56723a949fc1c7883c338df37 100644
--- a/packages/DEBIAN/changelog
+++ b/packages/DEBIAN/changelog
@@ -1,3 +1,9 @@
+vufind 5.1.1 distribution; urgency=low
+
+ * VuFind 5.1.1 release (see http://vufind.org/wiki/changelog for details)
+
+ -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net> Mo 6 May 2019 10:00:00 UTC
+
vufind 5.1 distribution; urgency=low
* VuFind 5.1 release (see http://vufind.org/wiki/changelog for details)
diff --git a/packages/DEBIAN/control b/packages/DEBIAN/control
index 6ce06f5b42e452a2fc34ede6a5fd642504477792..00e368d8321cb88706985e470614c63660bf6aa3 100644
--- a/packages/DEBIAN/control
+++ b/packages/DEBIAN/control
@@ -1,20 +1,21 @@
Package: vufind
-Version: 5.1
+Version: 5.1.1
Section: World Wide Web
Priority: Optional
Architecture: all
Depends: apache2,
default-jdk,
- libapache2-mod-php5 | libapache2-mod-php,
- libapache2-mod-php5 | php-mbstring,
+ libapache2-mod-php,
mysql-server | virtual-mysql-server-core,
php-pear,
php,
+ php-curl,
php-dev,
php-gd,
php-intl,
php-json,
php-ldap,
+ php-mbstring,
php-mysql,
php-soap,
php-xml
diff --git a/themes/bootprint3/less/bootprint.less b/themes/bootprint3/less/bootprint.less
index 837c8cc22950bbdadeef1baa19fd60d6dc549faf..9a12b16632d4950d52327f46c16db0e2d2279c2d 100644
--- a/themes/bootprint3/less/bootprint.less
+++ b/themes/bootprint3/less/bootprint.less
@@ -1,5 +1,11 @@
-@import "bootstrap";
+/* #LESS> */
+@import "../../bootstrap3/less/bootstrap";
@import "variables";
+/* <#LESS */
+/* #SCSS>
+@import "variables", "../../bootstrap3/scss/bootstrap";
+<#SCSS */
+
@import "icons";
@import "search";
@import "forms";
diff --git a/themes/bootprint3/scss/bootprint.scss b/themes/bootprint3/scss/bootprint.scss
index bfe8ca5ae77c29c8c85f9e14a0593e200ecaa2c3..e7b204be19ae906062260cad3a0f0f5b17cf726a 100644
--- a/themes/bootprint3/scss/bootprint.scss
+++ b/themes/bootprint3/scss/bootprint.scss
@@ -1,9 +1,16 @@
-@import "variables", "bootstrap";
+/* #LESS>
+@import "../../bootstrap3/less/bootstrap";
+@import "variables";
+<#LESS */
+/* #SCSS> */
+@import "variables", "../../bootstrap3/scss/bootstrap";
+/* <#SCSS */
+
@import "icons";
@import "search";
@import "forms";
-$brand-primary: #619144; /* a11y overrides $brand-primary in sass */
+$brand-primary: #619144 !default; /* a11y overrides $brand-primary in sass */
$active-orange: #E70 !default;
/* --- Bootstrap MODS ---*/
diff --git a/themes/bootprint3/scss/variables.scss b/themes/bootprint3/scss/variables.scss
index 3201c5b518f63f9ea894bf3db7d11f04589651fa..45a408d1e859b7f168c9ec595cbe47ab4472e5c1 100644
--- a/themes/bootprint3/scss/variables.scss
+++ b/themes/bootprint3/scss/variables.scss
@@ -1,4 +1,4 @@
-$brand-primary: #619144;
+$brand-primary: #619144 !default;
$font-size-base: 13px !default;
diff --git a/themes/bootstrap3/js/account_ajax.js b/themes/bootstrap3/js/account_ajax.js
index 76d069e94c58e19fa929a6653abf03c523da357c..5c91feb3ef86c5113783b0ef4b389c57eddfefca 100644
--- a/themes/bootstrap3/js/account_ajax.js
+++ b/themes/bootstrap3/js/account_ajax.js
@@ -122,7 +122,21 @@ VuFind.register('account', function Account() {
var init = function init() {
// Update information when certain actions are performed
- $('#cancelHold, #renewals').submit(clearCache);
+ $("#renewals").submit(function clearCheckedOut() {
+ clearCache("checkedOut");
+ });
+ $('#cancelHold, [name="placeHold"]').submit(function clearHolds() {
+ clearCache("holds");
+ });
+ $('#ILLRequestForm, #cancelILLRequest').submit(function clearHolds() {
+ clearCache("illRequests");
+ });
+ $('[name="placeStorageRetrievalRequest"], #cancelStorageRetrievalRequest').submit(function clearStorageRetrievals() {
+ clearCache("storageRetrievalRequests");
+ });
+ $("#library_card").change(function clearChangeLibraryCard() {
+ clearCache(/* all */);
+ });
};
var register = function register(name, module) {
diff --git a/themes/bootstrap3/js/embedded_record.js b/themes/bootstrap3/js/embedded_record.js
index d776276eefa099f4ad7bfd0ce09cbf7af31581b3..3482d7b61dfd4375099106f18a26e8de02fa7610 100644
--- a/themes/bootstrap3/js/embedded_record.js
+++ b/themes/bootstrap3/js/embedded_record.js
@@ -160,9 +160,7 @@ VuFind.register('embedded', function embedded() {
});
longNode.find('[id^=usercomment]').find('input[type=submit]').unbind('click').click(
function embeddedComments() {
- return registerAjaxCommentRecord(
- longNode.find('[id^=usercomment]').find('input[type=submit]').closest('form')
- );
+ return registerAjaxCommentRecord(longNode);
}
);
longNode.find('[data-background]').each(function setupEmbeddedBackgroundTabs(index, el) {
diff --git a/themes/bootstrap3/js/lib/autocomplete.js b/themes/bootstrap3/js/lib/autocomplete.js
index 29665dbf85e9947fd9800f4bd94821d1f9393e64..3c24ecc2e8b60386e2cac614dc5045899c46f64f 100644
--- a/themes/bootstrap3/js/lib/autocomplete.js
+++ b/themes/bootstrap3/js/lib/autocomplete.js
@@ -329,7 +329,7 @@
if (event.which === 13 && selected.attr('href') && options.callback === 'undefined') {
return window.location.assign(selected.attr('href'));
} else {
- _populate(selected.data(), $(this), { key: true });
+ _populate(selected.data(), { key: true });
}
}
break;
diff --git a/themes/bootstrap3/js/record.js b/themes/bootstrap3/js/record.js
index 5caa8621cdbd7c994207c5a6f537f8ceeb6db049..542ba53f24a7c556c7d6eaf055775cca070ed3c6 100644
--- a/themes/bootstrap3/js/record.js
+++ b/themes/bootstrap3/js/record.js
@@ -82,9 +82,10 @@ function refreshCommentList($target, recordId, recordSource) {
});
}
-function registerAjaxCommentRecord() {
+function registerAjaxCommentRecord(_context) {
+ var context = typeof _context === "undefined" ? document : _context;
// Form submission
- $('form.comment-form').unbind('submit').submit(function commentFormSubmit() {
+ $(context).find('form.comment-form').unbind('submit').submit(function commentFormSubmit() {
var form = this;
var id = form.id.value;
var recordSource = form.source.value;
diff --git a/themes/bootstrap3/less/bootstrap.less b/themes/bootstrap3/less/bootstrap.less
index 531431ca39cdff011a4e06f95f3dddfeb4e8b840..a6bebeca40be727660b9eb23e3db9df179848e10 100644
--- a/themes/bootstrap3/less/bootstrap.less
+++ b/themes/bootstrap3/less/bootstrap.less
@@ -1,5 +1,13 @@
+/* #LESS> */
@import "vendor/bootstrap/bootstrap";
@import "vendor/font-awesome/font-awesome";
+/* <#LESS */
+/* #SCSS>
+$fa-font-path: "../../bootstrap3/css/fonts";
+@import "vendor/bootstrap";
+@import "vendor/font-awesome/font-awesome";
+<#SCSS */
+
@import "vendor/bootstrap-accessibility/bootstrap-accessibility";
@import "vendor/a11y";
@@ -24,8 +32,10 @@
* Notes
* = As of 4.0, code styles aren't enforced, but
* preferred styles are outlined here: http://codeguide.co/#css
+ *
* = The preferred method for writing code is to put generic and mobile styles first
* and surround desktop styling with media min-width queries.
+ *
* = Bootstrap 3 breakpoints: <768px, >=768px, >=992px, >=1200px
* xs, sm, md, lg
* = Breakpoint of <=530px also used to target phones specifically
@@ -265,6 +275,10 @@ footer {
.myresearch-menu .badge.ok { background-color: @state-success-bg; }
.myresearch-menu .badge.warn { background-color: @state-warning-bg; }
.myresearch-menu .badge.overdue { background-color: @state-danger-bg; }
+.myresearch-menu .status .fa {
+ height: 1rem;
+ margin-top: 3px;
+}
.checkedout-status .badge {
border-radius: 2px;
@@ -272,7 +286,7 @@ footer {
border: 1px solid; /* color inherited from bootstrap */
height: 20px;
}
-.active .status .badge {
+.myresearch-menu .active .status .badge {
color: #fff;
background-color: transparent;
border: 1px solid #fff;
diff --git a/themes/bootstrap3/less/components/offcanvas.less b/themes/bootstrap3/less/components/offcanvas.less
index 4b4a7876ba6437c3d8059a2c99a79ea07373e57e..27bc492637593980fb292272a1c27336bb720c93 100644
--- a/themes/bootstrap3/less/components/offcanvas.less
+++ b/themes/bootstrap3/less/components/offcanvas.less
@@ -23,17 +23,12 @@
}
.offcanvas .close-offcanvas { display: block; }
- .search-filter-toggle {
- &:extend(.btn);
- &:extend(.btn-default);
- margin-top: 1rem;
- margin-bottom: 1rem;
- }
body.offcanvas {
overflow-x: hidden; /* Prevent scroll on narrow devices */
transition: margin .5s;
}
+
.offcanvas-overlay {
display: none;
position: fixed;
diff --git a/themes/bootstrap3/less/components/record.less b/themes/bootstrap3/less/components/record.less
index 06dab9c85fff75e85c5b79335ac94ee7feec277e..370f62c40c8c5f63f2eecccf77310f96a988005f 100644
--- a/themes/bootstrap3/less/components/record.less
+++ b/themes/bootstrap3/less/components/record.less
@@ -1,3 +1,7 @@
+.record h1 {
+ font-size: 24px;
+ line-height: 1.15;
+}
.record .media-body h3 { margin-top: 0; } // Align title with top of image
.recordcover { max-height: 300px; } // Keep the image from getting out of control
.browzine .recordcover {
@@ -127,4 +131,4 @@
}
/* ------ Relais ------ */
-.relaisLink { display: inline-block; }
\ No newline at end of file
+.relaisLink { display: inline-block; }
diff --git a/themes/bootstrap3/less/components/variables.less b/themes/bootstrap3/less/components/variables.less
index 3edcfee95bfe8cfb2c28b9a20fcb87786cfc8a87..3ec1aa0b0f1c2152e8e0ac5a85756a26baf21ca1 100644
--- a/themes/bootstrap3/less/components/variables.less
+++ b/themes/bootstrap3/less/components/variables.less
@@ -1,5 +1,7 @@
// Make sure Font Awesome icons are loaded properly
+/* #LESS> */
@fa-font-path: "../../../../../../themes/bootstrap3/css/fonts";
+/* <#LESS */
/**
* The following are useful Bootstrap variables that are used throughout the code,
diff --git a/themes/bootstrap3/scss/bootstrap.scss b/themes/bootstrap3/scss/bootstrap.scss
index 6d7518624b1a527e7ee678174dadd13d779ed1c8..598ade7062a67de7955d2ae418020a5d82fa35b7 100644
--- a/themes/bootstrap3/scss/bootstrap.scss
+++ b/themes/bootstrap3/scss/bootstrap.scss
@@ -1,6 +1,13 @@
+/* #LESS>
+@import "vendor/bootstrap/bootstrap";
+@import "vendor/font-awesome/font-awesome";
+<#LESS */
+/* #SCSS> */
+$fa-font-path: "../../bootstrap3/css/fonts" !default;
@import "vendor/bootstrap";
-$fa-font-path: "../../bootstrap3/css/fonts";
@import "vendor/font-awesome/font-awesome";
+/* <#SCSS */
+
@import "vendor/bootstrap-accessibility/bootstrap-accessibility";
@import "vendor/a11y";
@@ -25,8 +32,10 @@ $fa-font-path: "../../bootstrap3/css/fonts";
* Notes
* = As of 4.0, code styles aren't enforced, but
* preferred styles are outlined here: http://codeguide.co/#css
+ *
* = The preferred method for writing code is to put generic and mobile styles first
* and surround desktop styling with media min-width queries.
+ *
* = Bootstrap 3 breakpoints: <768px, >=768px, >=992px, >=1200px
* xs, sm, md, lg
* = Breakpoint of <=530px also used to target phones specifically
@@ -266,6 +275,10 @@ footer {
.myresearch-menu .badge.ok { background-color: $state-success-bg; }
.myresearch-menu .badge.warn { background-color: $state-warning-bg; }
.myresearch-menu .badge.overdue { background-color: $state-danger-bg; }
+.myresearch-menu .status .fa {
+ height: 1rem;
+ margin-top: 3px;
+}
.checkedout-status .badge {
border-radius: 2px;
@@ -273,7 +286,7 @@ footer {
border: 1px solid; /* color inherited from bootstrap */
height: 20px;
}
-.active .status .badge {
+.myresearch-menu .active .status .badge {
color: #fff;
background-color: transparent;
border: 1px solid #fff;
diff --git a/themes/bootstrap3/scss/components/offcanvas.scss b/themes/bootstrap3/scss/components/offcanvas.scss
index 020b7c0d3977a352fccb51376290405a038f44a8..8d39bd481bda35621e5aad3e7bd2cf265f90963a 100644
--- a/themes/bootstrap3/scss/components/offcanvas.scss
+++ b/themes/bootstrap3/scss/components/offcanvas.scss
@@ -31,6 +31,7 @@ $offcanvas-offset: 80vw !default; // Width of open menu
overflow-x: hidden; /* Prevent scroll on narrow devices */
transition: margin .5s;
}
+
.offcanvas-overlay {
display: none;
position: fixed;
diff --git a/themes/bootstrap3/scss/components/record.scss b/themes/bootstrap3/scss/components/record.scss
index d0ebcdb79ac2a591bc516e911628717b91503ba4..7ff7fd966d834a75b9127fccfac8035d36dc1b7c 100644
--- a/themes/bootstrap3/scss/components/record.scss
+++ b/themes/bootstrap3/scss/components/record.scss
@@ -1,3 +1,7 @@
+.record h1 {
+ font-size: 24px;
+ line-height: 1.15;
+}
.record .media-body h3 { margin-top: 0; } // Align title with top of image
.recordcover { max-height: 300px; } // Keep the image from getting out of control
.browzine .recordcover {
@@ -127,4 +131,4 @@
}
/* ------ Relais ------ */
-.relaisLink { display: inline-block; }
\ No newline at end of file
+.relaisLink { display: inline-block; }
diff --git a/themes/bootstrap3/scss/components/variables.scss b/themes/bootstrap3/scss/components/variables.scss
index 6562456e358ea4bc3d96ad46427cc6a7aa4e9ac3..da161c60fe9cf4e284a28384bc658635ef2ca245 100644
--- a/themes/bootstrap3/scss/components/variables.scss
+++ b/themes/bootstrap3/scss/components/variables.scss
@@ -1,5 +1,7 @@
// Make sure Font Awesome icons are loaded properly
+/* #LESS>
$fa-font-path: "../../../../../../themes/bootstrap3/css/fonts" !default;
+<#LESS */
/**
* The following are useful Bootstrap variables that are used throughout the code,
diff --git a/themes/bootstrap3/templates/Helpers/pagination.phtml b/themes/bootstrap3/templates/Helpers/pagination.phtml
index dc9125364a93c714d75566525c4d44681cecd7c7..874f5799a5eb1fec1cfe0e886ba63c0ee8ba82cf 100644
--- a/themes/bootstrap3/templates/Helpers/pagination.phtml
+++ b/themes/bootstrap3/templates/Helpers/pagination.phtml
@@ -4,10 +4,10 @@
<li<?php if (isset($this->previous)): ?>>
<?php $newParams = $this->params; $newParams['page'] = $this->previous; ?>
<a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>">
- « <?=$this->translate('Prev')?>
+ <span aria-hidden="true">«</span> <?=$this->translate('Prev')?>
</a>
<?php else: ?>
- class="disabled"> <span>« <?=$this->translate('Prev')?></span>
+ class="disabled"> <span><span aria-hidden="true">«</span> <?=$this->translate('Prev')?></span>
<?php endif; ?>
</li>
@@ -53,7 +53,7 @@
<?=$this->translate('Next')?> >
</a>
<?php else: ?>
- class="disabled"> <span><?=$this->translate('Next')?> »</span>
+ class="disabled"> <span><?=$this->translate('Next')?> <span aria-hidden="true">»</span></span>
<?php endif; ?>
</li>
</ul>
diff --git a/themes/bootstrap3/templates/RecordDriver/DefaultRecord/core.phtml b/themes/bootstrap3/templates/RecordDriver/DefaultRecord/core.phtml
index d9aa92a1f22e205815ea9ffea168f3736580b287..0e65032a1510215d4204086714daa9da49c1009b 100644
--- a/themes/bootstrap3/templates/RecordDriver/DefaultRecord/core.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/DefaultRecord/core.phtml
@@ -32,7 +32,7 @@
<?php endif; ?>
<div class="media-body">
- <h3 property="name"><?=$this->escapeHtml($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection())?></h3>
+ <h1 property="name"><?=$this->escapeHtml($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection())?></h1>
<?php $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?>
<?php if ($summary): ?>
diff --git a/themes/bootstrap3/templates/RecordDriver/DefaultRecord/toolbar.phtml b/themes/bootstrap3/templates/RecordDriver/DefaultRecord/toolbar.phtml
index d544352792a0952e5097d6bcbabd01f55af43256..daaea74f87e7b8fe35f387557f2bd84428e1ebb3 100644
--- a/themes/bootstrap3/templates/RecordDriver/DefaultRecord/toolbar.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/DefaultRecord/toolbar.phtml
@@ -16,10 +16,10 @@
<?php $exportFormats = $this->export()->getFormatsForRecord($this->driver); ?>
<?php if(count($exportFormats) > 0): ?>
<li class="dropdown">
- <a class="export-toggle dropdown-toggle" data-toggle="dropdown" href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>" rel="nofollow"><i class="fa fa-list-alt" aria-hidden="true"></i> <?=$this->transEsc('Export Record') ?></a>
+ <a class="export-toggle dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>" rel="nofollow"><i class="fa fa-list-alt" aria-hidden="true"></i> <?=$this->transEsc('Export Record') ?></a>
<ul class="dropdown-menu" role="menu">
<?php foreach ($exportFormats as $exportFormat): ?>
- <li><a <?php if ($this->export()->needsRedirect($exportFormat)): ?>target="<?=$this->escapeHtmlAttr($exportFormat)?>Main" <?php endif; ?>href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>?style=<?=$this->escapeHtmlAttr($exportFormat)?>" rel="nofollow"><?=$this->transEsc('Export to')?> <?=$this->transEsc($this->export()->getLabelForFormat($exportFormat))?></a></li>
+ <li role="none"><a <?php if ($this->export()->needsRedirect($exportFormat)): ?>target="<?=$this->escapeHtmlAttr($exportFormat)?>Main" <?php endif; ?>href="<?=$this->recordLink()->getActionUrl($this->driver, 'Export')?>?style=<?=$this->escapeHtmlAttr($exportFormat)?>" rel="nofollow" role="menuitem"><?=$this->transEsc('Export to')?> <?=$this->transEsc($this->export()->getLabelForFormat($exportFormat))?></a></li>
<?php endforeach; ?>
</ul>
</li>
diff --git a/themes/bootstrap3/templates/RecordDriver/EDS/core.phtml b/themes/bootstrap3/templates/RecordDriver/EDS/core.phtml
index ae075e294b56d7a77a1f2ed383a1584b6e1d032c..9c4de23a4d0017b91ee9069b70165bede11c90a7 100644
--- a/themes/bootstrap3/templates/RecordDriver/EDS/core.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/EDS/core.phtml
@@ -46,7 +46,7 @@
</div>
</div>
<div class="media-body info-col">
- <h3 property="name"><?=$this->driver->getTitle()?></h3>
+ <h1 property="name"><?=$this->driver->getTitle()?></h1>
<table class="table table-striped">
<caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
diff --git a/themes/bootstrap3/templates/alphabrowse/home.phtml b/themes/bootstrap3/templates/alphabrowse/home.phtml
index bcb034b18cd4bb864835461aaaeb28b3440e0f52..372cc8cb61c67f40826fdeeb968a2aa1d6c88380 100644
--- a/themes/bootstrap3/templates/alphabrowse/home.phtml
+++ b/themes/bootstrap3/templates/alphabrowse/home.phtml
@@ -19,15 +19,15 @@
<?php ob_start(); ?>
<ul class="pager">
<?php if (isset($this->prevpage)): ?>
- <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', [], ['query' => $baseQuery + ['page' => $this->prevpage]]))?>">« <?=$this->transEsc('Prev')?></a></li>
+ <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', [], ['query' => $baseQuery + ['page' => $this->prevpage]]))?>"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a></li>
<?php else: ?>
- <li class="disabled"><a href="#">« <?=$this->transEsc('Prev')?></a></li>
+ <li class="disabled"><a href="#"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a></li>
<?php endif; ?>
<?php if (isset($this->nextpage)): ?>
- <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', [], ['query' => $baseQuery + ['page' => $this->nextpage]]))?>"><?=$this->transEsc('Next')?> »</a></li>
+ <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', [], ['query' => $baseQuery + ['page' => $this->nextpage]]))?>"><?=$this->transEsc('Next')?> <span aria-hidden="true">»</span></a></li>
<?php else: ?>
- <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> »</a></li>
+ <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> <span aria-hidden="true">»</span></a></li>
<?php endif; ?>
</ul>
<?php $pageLinks = ob_get_contents(); ?>
@@ -108,7 +108,7 @@
</div>
<?php endif; ?>
- <?php if ($item['note']): ?>
+ <?php if ($item['note'] ?? false): ?>
<div>
<?=$this->transEsc('Note') ?>:
<ul>
diff --git a/themes/bootstrap3/templates/collection/view.phtml b/themes/bootstrap3/templates/collection/view.phtml
index 1e8112baef67d12efae089b7e01727d212a77589..c457658ed8211da3a391a004027b720adc7847bc 100644
--- a/themes/bootstrap3/templates/collection/view.phtml
+++ b/themes/bootstrap3/templates/collection/view.phtml
@@ -29,17 +29,17 @@
<?php if ($this->scrollData['previousRecord']): ?>
<?php if ($this->scrollData['firstRecord']): ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow">« <?=$this->transEsc('First')?></a>
+ <a href="<?=$this->recordLink()->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow"><span aria-hidden="true">«</span> <?=$this->transEsc('First')?></a>
</li>
<?php endif; ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">« <?=$this->transEsc('Prev')?></a>
+ <a href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a>
</li>
<?php else: ?>
<?php if ($this->scrollData['firstRecord']): ?>
- <li class="disabled"><a href="#">« <?=$this->transEsc('First')?></a></li>
+ <li class="disabled"><a href="#"><span aria-hidden="true">«</span> <?=$this->transEsc('First')?></a></li>
<?php endif; ?>
- <li class="disabled"><a href="#">« <?=$this->transEsc('Prev')?></a></li>
+ <li class="disabled"><a href="#"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a></li>
<?php endif; ?>
<?=$this->transEsc('of_num_results', [
'%%position%%' => $this->localizedNumber($this->scrollData['currentPosition']),
@@ -47,17 +47,17 @@
]) ?>
<?php if ($this->scrollData['nextRecord']): ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> »</a>
+ <a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> <span aria-hidden="true">»</span></a>
</li>
<?php if ($this->scrollData['lastRecord']): ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> »</a>
+ <a href="<?=$this->recordLink()->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> <span aria-hidden="true">»</span></a>
</li>
<?php endif; ?>
<?php else: ?>
- <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> »</a></li>
+ <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> <span aria-hidden="true">»</span></a></li>
<?php if ($this->scrollData['lastRecord']): ?>
- <li class="disabled"><a href="#"><?=$this->transEsc('Last')?> »</a></li>
+ <li class="disabled"><a href="#"><?=$this->transEsc('Last')?> <span aria-hidden="true">»</span></a></li>
<?php endif; ?>
<?php endif; ?>
</ul>
diff --git a/themes/bootstrap3/templates/collections/home.phtml b/themes/bootstrap3/templates/collections/home.phtml
index e5bea94fa2360d837cd7e50bfee38069ac600f7c..f220b1e66a99612d5f952086d963951bee8b38f3 100644
--- a/themes/bootstrap3/templates/collections/home.phtml
+++ b/themes/bootstrap3/templates/collections/home.phtml
@@ -15,14 +15,14 @@
<form class="form-inline" method="GET" action="<?=$this->url('collections-home')?>">
<ul class="pager">
<?php if (isset($prevpage)): ?>
- <li><a href="<?=$this->url('collections-home')?>?from=<?=urlencode($from)?>&page=<?=urlencode($prevpage)?><?=$this->escapeHtmlAttr($filterString)?>">« <?=$this->transEsc('Prev')?></a></li>
+ <li><a href="<?=$this->url('collections-home')?>?from=<?=urlencode($from)?>&page=<?=urlencode($prevpage)?><?=$this->escapeHtmlAttr($filterString)?>"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a></li>
<?php else: ?>
- <li class="disabled"><a href="#">« <?=$this->transEsc('Prev')?></a></li>
+ <li class="disabled"><a href="#"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a></li>
<?php endif; ?>
<?php if (isset($nextpage)): ?>
- <li><a href="<?=$this->url('collections-home')?>?from=<?=urlencode($from)?>&page=<?=urlencode($nextpage)?><?=$this->escapeHtmlAttr($filterString)?>"><?=$this->transEsc('Next')?> »</a></li>
+ <li><a href="<?=$this->url('collections-home')?>?from=<?=urlencode($from)?>&page=<?=urlencode($nextpage)?><?=$this->escapeHtmlAttr($filterString)?>"><?=$this->transEsc('Next')?> <span aria-hidden="true">»</span></a></li>
<?php else: ?>
- <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> »</a></li>
+ <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> <span aria-hidden="true">»</span></a></li>
<?php endif; ?>
<input type="submit" class="btn btn-default" value="<?=$this->transEsc('Jump to')?>" />
<input type="text" name="from" value="<?=$this->escapeHtmlAttr($from)?>" class="form-control" />
diff --git a/themes/bootstrap3/templates/myresearch/checkedout.phtml b/themes/bootstrap3/templates/myresearch/checkedout.phtml
index c5d69da312ff9578cb2e0508f461ebba143a960e..9dff2c8a96d26ab7ee90e46dfa0ca528fa99756a 100644
--- a/themes/bootstrap3/templates/myresearch/checkedout.phtml
+++ b/themes/bootstrap3/templates/myresearch/checkedout.phtml
@@ -9,6 +9,10 @@
$renewAll = !$this->ilsPaging || !$paginator;
?>
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<h2><?=$this->transEsc('Your Checked Out Items')?></h2>
<?=$this->flashmessages()?>
@@ -205,6 +209,6 @@
<?php endif; ?>
</div>
-<div class="<?=$this->layoutClass('sidebar')?>">
+<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'checkedout'])?>
</div>
diff --git a/themes/bootstrap3/templates/myresearch/fines.phtml b/themes/bootstrap3/templates/myresearch/fines.phtml
index 8300d9d9388cee5f49d643bfb4cc4c6acc79d705..40f940532f879c99dd0fca139400cfd3016503be 100644
--- a/themes/bootstrap3/templates/myresearch/fines.phtml
+++ b/themes/bootstrap3/templates/myresearch/fines.phtml
@@ -5,6 +5,11 @@
// Set up breadcrumbs:
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Fines') . '</li>';
?>
+
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<h2><?=$this->transEsc('Your Fines')?></h2>
<?=$this->flashmessages()?>
@@ -82,6 +87,6 @@
<?php endif; ?>
</div>
-<div class="<?=$this->layoutClass('sidebar')?>">
+<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'fines'])?>
</div>
diff --git a/themes/bootstrap3/templates/myresearch/historicloans.phtml b/themes/bootstrap3/templates/myresearch/historicloans.phtml
index d6e55653e0d6ab50e686bd501bbea5420019122f..a2b31aaca596fc10d35d9d7aef4a1f494ae17a08 100644
--- a/themes/bootstrap3/templates/myresearch/historicloans.phtml
+++ b/themes/bootstrap3/templates/myresearch/historicloans.phtml
@@ -6,6 +6,10 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Loan History') . '</li>';
?>
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<h2><?=$this->transEsc('Loan History')?></h2>
<?=$this->flashmessages()?>
@@ -126,6 +130,6 @@
<?php endif; ?>
</div>
-<div class="<?=$this->layoutClass('sidebar')?>">
+<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'historicloans'])?>
</div>
diff --git a/themes/bootstrap3/templates/myresearch/holds.phtml b/themes/bootstrap3/templates/myresearch/holds.phtml
index 74ce8c7ea0930604ef52f7a119fb789f7ec17e8e..4ff14f88ca8e00d279ccb213f1b4899e2f65ff62 100644
--- a/themes/bootstrap3/templates/myresearch/holds.phtml
+++ b/themes/bootstrap3/templates/myresearch/holds.phtml
@@ -6,6 +6,10 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('My Holds') . '</li>';
?>
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<h2><?=$this->transEsc('Your Holds and Recalls') ?></h2>
@@ -178,6 +182,6 @@
<?php endif; ?>
</div>
-<div class="<?=$this->layoutClass('sidebar')?>">
+<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'holds'])?>
</div>
diff --git a/themes/bootstrap3/templates/myresearch/illrequests.phtml b/themes/bootstrap3/templates/myresearch/illrequests.phtml
index d880f395d513626ea1cacfd5bdc87d56d44e46e8..8094311a8d526e5e6bf3703a038f4696577fc163 100644
--- a/themes/bootstrap3/templates/myresearch/illrequests.phtml
+++ b/themes/bootstrap3/templates/myresearch/illrequests.phtml
@@ -6,6 +6,11 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>'
. '<li class="active">' . $this->transEsc('Interlibrary Loan Requests') . '</li>';
?>
+
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<h2><?=$this->transEsc('Interlibrary Loan Requests') ?></h2>
@@ -172,6 +177,6 @@
<?php endif; ?>
</div>
-<div class="<?=$this->layoutClass('sidebar')?>">
+<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'ILLRequests'])?>
</div>
diff --git a/themes/bootstrap3/templates/myresearch/menu.phtml b/themes/bootstrap3/templates/myresearch/menu.phtml
index d7f9ba01a2f8df03c3b5194021d303658fee903b..8237e4e615b4d4713152afead1dc045c60efb40a 100644
--- a/themes/bootstrap3/templates/myresearch/menu.phtml
+++ b/themes/bootstrap3/templates/myresearch/menu.phtml
@@ -3,6 +3,7 @@
$patron = $user ? $this->auth()->getILSPatron() : false;
$capabilityParams = $patron ? ['patron' => $patron] : [];
?>
+<button class="close-offcanvas btn btn-link" data-toggle="offcanvas"><?=$this->transEsc('navigate_back') ?></button>
<h4><?=$this->transEsc('Your Account')?></h4>
<div class="myresearch-menu account-menu">
<?php if ($this->userlist()->getMode() !== 'disabled'): ?>
diff --git a/themes/bootstrap3/templates/myresearch/mylist.phtml b/themes/bootstrap3/templates/myresearch/mylist.phtml
index f0f6b56e28cb8ca6ae807884a21031d492c5b7ee..c231b4e302b9b518849a6ed5bc6a69159a631dd3 100644
--- a/themes/bootstrap3/templates/myresearch/mylist.phtml
+++ b/themes/bootstrap3/templates/myresearch/mylist.phtml
@@ -25,10 +25,15 @@
$user = $this->auth()->isLoggedIn();
?>
-<?=$this->flashmessages()?>
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
<div class="<?=$this->layoutClass('mainbody')?>">
<h2><?=$list ? $this->escapeHtml($list->title) : $this->transEsc("Your Favorites")?></h2>
+
+ <?=$this->flashmessages()?>
+
<nav class="search-header hidden-print">
<div class="search-stats">
<?php if ($recordTotal > 0): ?>
@@ -79,7 +84,7 @@
<?php endif; ?>
</div>
-<div class="<?=$this->layoutClass('sidebar')?>">
+<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => isset($list) ? 'list' . $list['id'] : 'favorites'])?>
<?php foreach ($this->results->getRecommendations('side') as $current): ?>
<?=$this->recommend($current)?>
diff --git a/themes/bootstrap3/templates/myresearch/profile.phtml b/themes/bootstrap3/templates/myresearch/profile.phtml
index 7032e3a602469f9b5e820b780ece4b01d6b4094e..e34a4d6c2726ab8a7728cd554549db06cfa46676 100644
--- a/themes/bootstrap3/templates/myresearch/profile.phtml
+++ b/themes/bootstrap3/templates/myresearch/profile.phtml
@@ -8,6 +8,11 @@
// Template for use by the renderArray helper:
$arrTemplate = '<tr><th>%%LABEL%%:</th><td> %%VALUE%%</td></tr>';
?>
+
+<a class="search-filter-toggle visible-xs" href="#account-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<h2><?=$this->transEsc('Your Profile')?></h2>
<?=$this->flashmessages();?>
@@ -82,6 +87,6 @@
<?php endif; ?>
</div>
-<div class="<?=$this->layoutClass('sidebar')?>">
+<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'profile'])?>
</div>
diff --git a/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml b/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml
index 412579a4f5b5d50f6c4535d958a61f6d45bd2846..513dc4d5e81f632ae99ba8585bea629a2cd3aa1c 100644
--- a/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml
+++ b/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml
@@ -6,6 +6,10 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Storage Retrieval Requests') . '</li>';
?>
+<a class="search-filter-toggle visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<h2><?=$this->transEsc('Storage Retrieval Requests') ?></h2>
@@ -169,6 +173,6 @@
<?php endif; ?>
</div>
-<div class="<?=$this->layoutClass('sidebar')?>">
+<div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'storageRetrievalRequests'])?>
</div>
diff --git a/themes/bootstrap3/templates/record/view.phtml b/themes/bootstrap3/templates/record/view.phtml
index acb9cca27a3693e7bd99335bc87fe140ec054415..a35ff7909c6f12742e615c04c0c308ad42c3e008 100644
--- a/themes/bootstrap3/templates/record/view.phtml
+++ b/themes/bootstrap3/templates/record/view.phtml
@@ -23,17 +23,17 @@
<?php if ($this->scrollData['previousRecord']): ?>
<?php if ($this->scrollData['firstRecord']): ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow">« <?=$this->transEsc('First')?></a>
+ <a href="<?=$this->recordLink()->getUrl($this->scrollData['firstRecord'])?>" title="<?=$this->transEsc('First Search Result')?>" rel="nofollow"><span aria-hidden="true">«</span> <?=$this->transEsc('First')?></a>
</li>
<?php endif; ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">« <?=$this->transEsc('Prev')?></a>
+ <a href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a>
</li>
<?php else: ?>
<?php if ($this->scrollData['firstRecord']): ?>
- <li class="disabled"><a href="#">« <?=$this->transEsc('First')?></a></li>
+ <li class="disabled"><a href="#"><span aria-hidden="true">«</span> <?=$this->transEsc('First')?></a></li>
<?php endif; ?>
- <li class="disabled"><a href="#">« <?=$this->transEsc('Prev')?></a></li>
+ <li class="disabled"><a href="#"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a></li>
<?php endif; ?>
<?=$this->transEsc('of_num_results', [
'%%position%%' => $this->localizedNumber($this->scrollData['currentPosition']),
@@ -41,17 +41,17 @@
]) ?>
<?php if ($this->scrollData['nextRecord']): ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> »</a>
+ <a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> <span aria-hidden="true">»</span></a>
</li>
<?php if ($this->scrollData['lastRecord']): ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> »</a>
+ <a href="<?=$this->recordLink()->getUrl($this->scrollData['lastRecord'])?>" title="<?=$this->transEsc('Last Search Result')?>" rel="nofollow"><?=$this->transEsc('Last')?> <span aria-hidden="true">»</span></a>
</li>
<?php endif; ?>
<?php else: ?>
- <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> »</a></li>
+ <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> <span aria-hidden="true">»</span></a></li>
<?php if ($this->scrollData['lastRecord']): ?>
- <li class="disabled"><a href="#"><?=$this->transEsc('Last')?> »</a></li>
+ <li class="disabled"><a href="#"><?=$this->transEsc('Last')?> <span aria-hidden="true">»</span></a></li>
<?php endif; ?>
<?php endif; ?>
</ul>
diff --git a/themes/bootstrap3/templates/search/history.phtml b/themes/bootstrap3/templates/search/history.phtml
index 73c2b7953900b8012465abb6fde19a369d53544e..a0ca86a36b06b8be3315546a6dcb5105a29e79e6 100644
--- a/themes/bootstrap3/templates/search/history.phtml
+++ b/themes/bootstrap3/templates/search/history.phtml
@@ -9,6 +9,10 @@
$saveSupported = $this->accountCapabilities()->getSavedSearchSetting() === 'enabled';
?>
+<a class="search-filter-toggle visible-xs" href="#account-sidebar" data-toggle="offcanvas" title="Expand Sidebar">
+ <?=$this->transEsc('Your Account') ?>
+</a>
+
<div class="<?=$this->layoutClass('mainbody')?>">
<?=$this->flashmessages()?>
<?php if ($saveSupported && !empty($this->saved)): ?>
@@ -26,7 +30,7 @@
</div>
<?php if ($saveSupported): ?>
- <div class="<?=$this->layoutClass('sidebar')?>">
+ <div class="<?=$this->layoutClass('sidebar')?>" id="myresearch-sidebar">
<?=$this->context($this)->renderInContext(
"myresearch/menu.phtml",
// Only activate search history in account menu if user is logged in.
diff --git a/themes/bootstrap3/templates/search/pagination.phtml b/themes/bootstrap3/templates/search/pagination.phtml
index ed0993063bd45fad85e0845e317a35b20e60c16e..168bd1484e5e4a2bbe4d39f7b544653672c11829 100644
--- a/themes/bootstrap3/templates/search/pagination.phtml
+++ b/themes/bootstrap3/templates/search/pagination.phtml
@@ -4,7 +4,7 @@
<?php if (!isset($this->options['disableFirst']) || !$this->options['disableFirst']): ?>
<li><a href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage(1)?>">[1]</a></li>
<?php endif; ?>
- <li><a class="page-prev" href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->previous)?>">« <?=$this->transEsc('Prev')?></a></li>
+ <li><a class="page-prev" href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->previous)?>"><span aria-hidden="true">«</span> <?=$this->transEsc('Prev')?></a></li>
<?php endif; ?>
<?php if (count($this->pagesInRange) > 1): ?>
@@ -18,7 +18,7 @@
<?php endif; ?>
<?php if (isset($this->next)): ?>
- <li><a class="page-next" href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->next)?>"><?=$this->transEsc('Next');?> »</a></li>
+ <li><a class="page-next" href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->next)?>"><?=$this->transEsc('Next');?> <span aria-hidden="true">»</span></a></li>
<?php if (!isset($this->options['disableLast']) || !$this->options['disableLast']): ?>
<li><a href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->pageCount)?>">[<?=$this->pageCount?>]</a></li>
<?php endif; ?>
diff --git a/themes/sandal/less/colors.less b/themes/sandal/less/colors.less
index 15d419524ace9539ba4c5c91ef84be764d081289..125691d93ec92360dee0c540050b4277f0faf6c1 100644
--- a/themes/sandal/less/colors.less
+++ b/themes/sandal/less/colors.less
@@ -21,7 +21,7 @@
@sidebar-title-bg: @white;
@sidebar-title-color: @near-black;
-@sidebar-title-icon-color: @gray-light;
+@sidebar-title-icon-color: @light-gray;
@sidebar-item-bg: @white;
@sidebar-item-color: @black;
@sidebar-item-hover-bg: @lightest-blue;
diff --git a/themes/sandal/less/sandal.less b/themes/sandal/less/sandal.less
index 6c2095afc59f2958cec121f366f8c16ec3cdb796..376f69b375d070375c8f802edc5100e4de7d8873 100644
--- a/themes/sandal/less/sandal.less
+++ b/themes/sandal/less/sandal.less
@@ -1,6 +1,12 @@
-@import "bootstrap";
+/* #LESS> */
+@import "../../bootstrap3/less/bootstrap";
@import "colors";
@import "variables";
+/* <#LESS */
+/* #SCSS>
+@import "colors", "variables", "../../bootstrap3/scss/bootstrap";
+<#SCSS */
+
@import "common";
@import "search";
@import "rtl";
@@ -103,6 +109,25 @@ header {
}
}
+#account-icon.text-success,
+#account-icon.text-warning,
+#account-icon.text-danger {
+ margin-left: -.25rem;
+ margin-top: -0.5rem;
+ margin-bottom: -.5rem;
+ padding: 0.5rem;
+ background-color: @header-light;
+ border-radius: 100%;
+}
+#login-dropdown .login-dropdown-caret:hover,
+a:hover .login-dropdown-caret {
+ color: #222;
+}
+#login-dropdown .login-dropdown-caret[aria-expanded="true"] {
+ color: #fff;
+ background-color: @header-bg;
+}
+
.breadcrumbs {
border-bottom: 1px solid @header-light;
background-color: @header-light;
@@ -135,6 +160,10 @@ header {
/* --- MyResearch --- */
.myresearch-menu a:hover { background-color: @white; }
+.myresearch-menu a.active:hover {
+ color: @white;
+ background-color: @brand-primary;
+}
/* --- Record --- */
.record-nav {
diff --git a/themes/sandal/scss/colors.scss b/themes/sandal/scss/colors.scss
index 59d6aa824cd02cdf4950894520ceebacfad013d9..17de5ebb4071c141126be6e58c2118a3e792152d 100644
--- a/themes/sandal/scss/colors.scss
+++ b/themes/sandal/scss/colors.scss
@@ -21,7 +21,7 @@ $search-row-selected-color: $white !default;
$sidebar-title-bg: $white !default;
$sidebar-title-color: $near-black !default;
-$sidebar-title-icon-color: $gray-light !default;
+$sidebar-title-icon-color: $light-gray !default;
$sidebar-item-bg: $white !default;
$sidebar-item-color: $black !default;
$sidebar-item-hover-bg: $lightest-blue !default;
diff --git a/themes/sandal/scss/sandal.scss b/themes/sandal/scss/sandal.scss
index 5a6a7108278a4a7262e654e3b39a7bafe406662e..18898fcd6862d7562a53056d3ef7584725d2300f 100644
--- a/themes/sandal/scss/sandal.scss
+++ b/themes/sandal/scss/sandal.scss
@@ -1,6 +1,12 @@
-@import "bootstrap";
+/* #LESS>
+@import "../../bootstrap3/less/bootstrap";
@import "colors";
@import "variables";
+<#LESS */
+/* #SCSS> */
+@import "colors", "variables", "../../bootstrap3/scss/bootstrap";
+/* <#SCSS */
+
@import "common";
@import "search";
@import "rtl";
@@ -27,13 +33,13 @@ body {
a { color: #fff; }
}
-.banner .navbar-right { margin-top: calc(($banner-height-sm - 50px) / 2); } // Put right nav in the middle
+.banner .navbar-right { margin-top: calc((#{$banner-height-sm} - 50px) / 2); } // Put right nav in the middle
.banner .navbar-brand {
width: (170 / 65) * $banner-height-sm;
height: $banner-height-sm;
}
@media (min-width: 768px) {
- .banner .navbar-right { margin-top: calc(($banner-height - 50px) / 2); }
+ .banner .navbar-right { margin-top: calc((#{$banner-height} - 50px) / 2); }
.banner .navbar-brand {
width: (170 / 65) * $banner-height;
height: $banner-height;
@@ -103,6 +109,25 @@ header {
}
}
+#account-icon.text-success,
+#account-icon.text-warning,
+#account-icon.text-danger {
+ margin-left: -.25rem;
+ margin-top: -0.5rem;
+ margin-bottom: -.5rem;
+ padding: 0.5rem;
+ background-color: $header-light;
+ border-radius: 100%;
+}
+#login-dropdown .login-dropdown-caret:hover,
+a:hover .login-dropdown-caret {
+ color: #222;
+}
+#login-dropdown .login-dropdown-caret[aria-expanded="true"] {
+ color: #fff;
+ background-color: $header-bg;
+}
+
.breadcrumbs {
border-bottom: 1px solid $header-light;
background-color: $header-light;
@@ -135,6 +160,10 @@ header {
/* --- MyResearch --- */
.myresearch-menu a:hover { background-color: $white; }
+.myresearch-menu a.active:hover {
+ color: $white;
+ background-color: $brand-primary;
+}
/* --- Record --- */
.record-nav {