Attachment 14329 Details for Bug 9052 – [SIGNED-OFF] Bug 9052 - followup: fix the YUI CSS locations for SCO

[patch] [SIGNED-OFF] Bug 9052 - followup: fix the YUI CSS locations for SCO

SIGNED-OFF-Bug-9052---followup-fix-the-YUI-CSS-loc.patch (text/plain), 3.35 KB, created by Katrin Fischer on 2012-12-30 13:52:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2012-12-30 13:52:02 UTC

Size: 3.35 KB

patch

obsolete

>From cef104a92fd81e84deb2d0a5d43a9ffaa48f4858 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] [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 <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) 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 @@
> <meta name="generator" content="Koha [% Version %]" /> 
> <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" />
> [% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% 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 ) %]<script type="text/javascript">[% opacuserjs %]</script>[% END %]
> [% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</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 %]
> [% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 9052: 13720 | 14110 | 14118 | 14159 | 14178 | 14185 | 14329