[Koha-patches] [PATCH] Bug 8111 - Language chooser display problem in self-checkout

[Owen Leonard]

- 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.
---
 koha-tmpl/opac-tmpl/prog/en/css/sco.css            |   74 ++++++++++++++------
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |   33 +++++++++
 koha-tmpl/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 234036b..3c4a8b4 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 35db4fd..8eb9f08 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 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
 <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
+<!-- yui js -->
+<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
+<script type="text/javascript" src="[% yuipath %]/container/container-min.js"></script>
+<script type="text/javascript" src="[% yuipath %]/menu/menu-min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript">//<![CDATA[
@@ -34,6 +38,35 @@ function checkout_confirm(patronid) {
     return true;
 }
 
+// build Change Language menus
+YAHOO.util.Event.onContentReady("changelanguage", function () {
+  $(".sublangs").each(function(){
+    var menuid = $(this).attr("id");
+    var menuid = menuid.replace("show","");
+
+    var oMenu = new YAHOO.widget.Menu("sub"+menuid, { zindex: 2 });
+    function positionoMenu() {
+      oMenu.align("bl", "tl");
+    }
+    oMenu.subscribe("beforeShow", function () {
+    if (this.getRoot() == this) {
+      positionoMenu();
+    }
+    });
+    oMenu.render();
+    oMenu.cfg.setProperty("context", ["show"+menuid, "bl", "tl"]);
+    function onYahooClick(p_oEvent) {
+      // Position and display the menu
+      positionoMenu();
+      oMenu.show();
+      // Stop propagation and prevent the default "click" behavior
+      YAHOO.util.Event.stopEvent(p_oEvent);
+    }
+    YAHOO.util.Event.addListener("show"+menuid, "click", onYahooClick);
+    YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
+  });
+});
+
 $.tablesorter.addParser({
     id: 'articles',
     is: function(s) {return false;  },
diff --git a/koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif b/koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif
deleted file mode 100644
index 68bd824db7538dd41f83dc424b414000236a7cae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66
zcmZ?wbhEHb<YwSyn8?JC(sQU`+3o-T|1&T!DE?$&WME)o&;ha;K=KSs!c+QJp6-31
Tz^r&?SH at P)WcD^UMh0sDd$JQG

-- 
1.7.9.5