From ab693d87969a941dd7f27e49214b7df087c24204 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 27 Oct 2025 18:09:55 +0000 Subject: [PATCH] Bug 21266: Added missing doc-head-close and cssinclude to sco-main.tt This is a re-implementation of the previous patch set with additional de-duplication of markup. The patch also removes some redunancy from sco.scss and makes a few minor changes to markup to bring the templates in better alignment with the OPAC. Test plan: 1. Add a custom opac theme stylesheet in OpacAdditionalStylesheet syspref 2. Also ensure you have set the syspref: WebBasedSelfCheck to 'Enable' and use a patron with the self_check_permissions, and enable AutoSelfCheckAllowed syspref and write in the username and password of the aforementioned user into the AutoSelfCheckID and AuoSelfCheckPass sysprefs 3. Go to the self checkout page and notice the OPAC theme is not being applied to the self check interface. 4. Apply patch and rebuild the OPAC CSS. 5. Refresh the page and notice the custom theme is being applied. 6. Perform the same test with the SCOUserCSS preference. Sponsored-By: Central Agencies (Treasury), New Zealand Sponsored-by: Athens County Public Libraries --- .../opac-tmpl/bootstrap/css/src/sco.scss | 8 --- .../bootstrap/en/includes/masthead-sco.inc | 13 ++-- .../bootstrap/en/includes/masthead.inc | 2 +- .../bootstrap/en/modules/sco/help.tt | 63 ++++++------------- .../bootstrap/en/modules/sco/sco-main.tt | 53 +++------------- opac/sco/help.pl | 5 -- 6 files changed, 37 insertions(+), 107 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/sco.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/sco.scss index 64e6063397e..7294f11c668 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/sco.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/sco.scss @@ -1,9 +1,3 @@ -@import "common"; - -body { - background-color: #FCF9FC; -} - a { color: $sci-link-color; @@ -77,5 +71,3 @@ a { margin-top: 1rem; padding-top: 1rem; } - -@import "responsive"; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc index 624dcc4b196..44760a8942a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc @@ -7,7 +7,7 @@