From e7459c6bf21f1f95360070bb4a18e5b5a4be1496 Mon Sep 17 00:00:00 2001 From: Robin Sheat <robin@catalyst.net.nz> 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. --- koha-tmpl/opac-tmpl/prog/en/css/sco.css | 3 +++ koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt | 2 -- .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 -- 3 files changed, 3 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 4d8e25a..0ad366d 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; } 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 32b4f56..df4f0d3 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 @@ <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" /> -<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" /> -<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" /> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" /> </head> <body> 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 1398673..3fdf2f4 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 ) %]<script type="text/javascript">[% opacuserjs %]</script>[% END %] -<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" /> -<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" /> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" /> [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] -- 1.7.9.5