From cef104a92fd81e84deb2d0a5d43a9ffaa48f4858 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Tue, 18 Dec 2012 17:48:46 +1300 Subject: [PATCH] [SIGNED-OFF] 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) Verfiy 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 --- koha-tmpl/opac-tmpl/prog/en/css/sco.css | 5 ++++- koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt | 2 -- .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sco.css b/koha-tmpl/opac-tmpl/prog/en/css/sco.css index 0a81ddd..d2387f0 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; } @@ -339,4 +342,4 @@ div.ft { } .inline { display: inline; -} \ No newline at end of file +} 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 f2fa3a9..b0d2445 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 @@ - - [% IF ( SCOUserCSS ) %][% END %] 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 5441ccf..3f6438f 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 @@ -100,8 +100,6 @@ $(document).ready(function(){ [% IF ( opacuserjs ) %][% END %] [% IF ( SCOUserJS ) %][% END %] - - [% IF ( OPACUserCSS ) %][% END %] [% IF ( SCOUserCSS ) %][% END %] -- 1.7.9.5