From 33416b3b5aea4cc7aeda0cd5043cc95cc0b253b6 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Mon, 25 Jan 2021 12:17:48 +0000 Subject: [PATCH] Bug 27378: Move "Your cookies" to existing bar The new "Your cookies" button that appeared at the bottom right when an unauthenticated user had made their cookie consent selections wasn't ideal. It has now been moved to the top bar, next to "Lists", this feels like a much more sensible place for it. Signed-ff-by: Barry Cannon --- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 11 ----------- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 15 +++++++++------ koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js | 7 +++---- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 36707a8e3f..c5dc997a62 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -2675,17 +2675,6 @@ $star-selected: #EDB867; } } -#cookieConsentButton { - position: fixed; - border: 0; - bottom: 0; - right: 0; - padding: 10px; - background: rgba(0,0,0,0.75); - color: rgba(255,255,255,0.8); - z-index: 1; -} - #viewCookieConsents { margin-top: 10px; } diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index b4de1ba658..c39cd32506 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -82,6 +82,15 @@ [% END # / IF virtualshelves %] + + [% IF !loggedinusername %] + + + [% END %] [% IF Koha.Preference( 'opacuserlogin' ) == 1 || Koha.Preference( 'EnableOpacSearchHistory') || Koha.Preference( 'opaclanguagesdisplay' ) %] @@ -431,12 +440,6 @@ [% END %] - - [% IF !loggedinusername %] - - [% END %]