From ed7155cd721f00e029c4cbec00abb899ce67afb9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 21 May 2024 14:47:21 +0000 Subject: [PATCH] Bug 36909: Eliminate duplicate ID in cookie consent markup This patch changes markup and CSS in the OPAC and staff client to eliminate HTML validator warnings about duplicate ids. To test, apply the patch and rebuild all CSS (Bug 36909: Eliminate duplicate ID in cookie consent markup). - If necessary, set the "CookieConsent" system preference to "Require." - Open the OPAC in a new private window (to prevent previous consents from hiding the consent messages). - You should see a cookie consent bar across the bottom of the page. It should look correct, and its contents should reflow well at various browser widths. - Click "Accept all cookies." - In the header you should now see a "Your cookies" link. - Click it and confirm that the contents of the modal look correct and reflow well at various browser widths. - Perform the same tests in the staff interface. --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index a0ba90ad5d..7436fb17a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -4688,7 +4688,7 @@ div .suggestion_note { } } -#consentButtons { +.consentButtons { flex-grow: 1; margin-top: 10px; text-align: left; @@ -4829,7 +4829,7 @@ div .suggestion_note { @import "forms"; @media only screen and ( min-width: 608px ) { - #consentButtons { + .consentButtons { text-align: right; white-space: nowrap; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index 24572c2a3a..f4055268e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -92,7 +92,7 @@ [%- END -%] [% END %] -
+
[% IF ( JSConsents.all('staffConsent').size ) %] [% END %] @@ -131,7 +131,7 @@