From e24bcabb05d0716711c894f07cf7b05b59bc0086 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Tue, 18 Dec 2012 17:48:46 +1300 Subject: [PATCH] Bug 9052 - followup: fix the YUI CSS locations for SCO This is followup to the previous YUI-fixing patch, and simply causes the self-checkout page to load the YUI files via the sco CSS file, and that gets re-written at package build time to work. Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Tested on a package installation using packages built by Mirko Tietgen and a git dev installation. To test: 1) Enable WebBasedSelfCheck system preference 2) Enter login date for staff user in AutoSelfCheckAllowed... prefernces 3) Go to the self checkout page: .../cgi-bin/koha/sco/sco-main.pl 4) Verify all pages have the usual look, CSS, Javascript and images look normal 5) Verify the same is true for translated templates Manual: http://manual.koha-community.org/3.10/en/selfcheckout.html Signed-off-by: Jared Camins-Esakov --- koha-tmpl/opac-tmpl/prog/en/css/sco.css | 7 +++++++ koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt | 2 -- koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sco.css b/koha-tmpl/opac-tmpl/prog/en/css/sco.css index 4d8e25a598..7b0a9e8325 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/sco.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/sco.css @@ -1,3 +1,6 @@ +@import url("/opac-tmpl/lib/yui/reset-fonts-grids.css"); +@import url("/opac-tmpl/lib/yui/skin.css"); + a { font-weight : bold; } @@ -336,3 +339,7 @@ span.lang{ div.ft { clear : both; } + +.inline { + display: inline; +} diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt index 32b4f56f78..df4f0d3e58 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt @@ -3,8 +3,6 @@ - - diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt index 139867343b..3fdf2f4b5f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt @@ -110,8 +110,6 @@ $(document).ready(function(){ [% IF ( opacuserjs ) %][% END %] - - [% IF ( OPACUserCSS ) %][% END %] -- 2.20.1