From 3b8065d7bfeb05524bdfe9bd4d4e1d073dd67735 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 (cherry picked from commit a663a7afa5fec005fed90b8a870e6633e133a539) Signed-off-by: Sam Lau --- 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 4e1419f2fc..8f8bb82540 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -2924,17 +2924,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 0a3931f41e..785ca492a5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -84,6 +84,15 @@ [% END # / IF virtualshelves %] + + [% IF !loggedinusername %] + + + [% END %] [% IF Koha.Preference( 'opacuserlogin' ) == 1 || Koha.Preference( 'EnableOpacSearchHistory') || Koha.Preference( 'opaclanguagesdisplay' ) %] @@ -448,12 +457,6 @@ [% END %] - - [% IF !loggedinusername %] - - [% END %]