projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d5cfa12)
Bug 9052 - followup: fix the YUI CSS locations for SCO
authorRobin Sheat <robin@catalyst.net.nz>
Tue, 18 Dec 2012 04:48:46 +0000 (17:48 +1300)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 30 Dec 2012 23:35:06 +0000 (18:35 -0500)
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 <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
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 <jcamins@cpbibliography.com>
koha-tmpl/opac-tmpl/prog/en/css/sco.css patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt patch | blob | history

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sco.css b/koha-tmpl/opac-tmpl/prog/en/css/sco.css
index 4d8e25a..7b0a9e8 100644 (file)
--- 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 32b4f56..df4f0d3 100644 (file)
--- 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 (file)
--- 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 %]
 
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git