From 9c3aaa0de911e2962b87ab4f42b21cc04692d56a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 16 May 2012 12:44:56 -0400 Subject: [PATCH] Bug 8111 - Language chooser display problem in self-checkout - Adds required JavaScript and JavaScript linked files - Updates CSS with changes relevant to this feature which had been made to the main CSS file. - Removes an image file which has been made obsolete now that sco.css uses the main image sprite like opac.css does. Signed-off-by: Chris Cormack Signed-off-by: Paul Poulain --- koha-tmpl/opac-tmpl/prog/en/css/sco.css | 74 ++++++++++++------ .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 33 ++++++++ .../opac-tmpl/prog/images/more-up-arrow.gif | Bin 66 -> 0 bytes 3 files changed, 84 insertions(+), 23 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sco.css b/koha-tmpl/opac-tmpl/prog/en/css/sco.css index 234036b8fd..3c4a8b4da2 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/sco.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/sco.css @@ -271,41 +271,69 @@ a.koha_url { color: #666666; } - div#changelanguage{ - background-color: #fff; - border-top: 1px solid #CCC; - color : #666; - font-size : 85%; - padding : 1em; - margin-top : 2em; + background-color: #fff; + border-top: 1px solid #CCC; + color : #666; + font-size : 85%; + padding : 1em; + margin-top : 2em; } div#changelanguage a { - font-weight : normal; - padding : .5em; + font-weight : normal; + padding : .5em 0; } -div#changelanguage a.more { - background-image:url(../../images/more-up-arrow.gif); - background-position:right center; - background-repeat:no-repeat; - padding-right:13px; +div#changelanguage li.yuimenuitem { + font-size: 120%; + font-weight: normal; + margin: 0; + padding: 0 1em; +} +div#changelanguage li.yuimenuitem a.yuimenuitemlabel { + padding: 0; } -div#changelanguage li.yuimenuitem { - font-size : 120%; - font-weight : normal; - margin : 0; - padding : 0 1em; +ul#i18nMenu { + margin : 0; + padding : .2em 0; + } + +ul#i18nMenu li { + border-left : 1px solid #CCC; + display : inline; + list-style : none; + padding : 0 .4em; + } + +ul#i18nMenu li:first-child { + border-left : 0; + } + +ul#i18nMenu li ul li { + border : 0; + display : block; + padding : 0; + } + + +ul#i18nMenu li.more a { + background-image : url("../../images/sprite.png"); + background-position : 37px -940px; + background-repeat:no-repeat; + padding-right: 1.3em; } -div#changelanguage li.yuimenuitem a.yuimenuitemlabel { - padding : 0; +ul#i18nMenu li.more ul li a { + background-image : none; + padding: 0 1.3em; } -div.lang{ - float:left; +span.lang{ + float:left; + border-right : 1px solid black; + padding : 0 .5em; } div.ft { 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 35db4fd4ac..8eb9f082a7 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 @@ -3,6 +3,10 @@ + + + +