From 6da833baf16f940e9780a2a90a523c3f5ee2f41d Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 27 Oct 2011 17:58:28 +0100
Subject: [PATCH] Bug 7108 - OPAC Translations Display Patch

If multiple similar languages (i.e: fr-FR, fr-CS or en, en-GB) are installed
and  the opaclanguagesdisplay preference is set to allow patrons to choose a
language then at each occurrence of a language with multiple options the
display is the selector splits across multiple lines breaking the display.

http://bugs.koha-community.org/show_bug.cgi?id=7108
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit ccc182f260249e4de485e338abcbe9bc95ca98c8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css             | 4 ++++
 koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 11c434fc66..898e0aaf9d 100755
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1448,6 +1448,10 @@ div#changelanguage li.yuimenuitem a.yuimenuitemlabel {
 	padding : 0;
 }
 
+div.lang{
+        float:left;
+}
+
 #cartDetails,#cartUpdate,#holdDetails,#listsDetails {
 	background-color : #FFF;
 	border: 1px solid #739acf;
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
index 59188ef45c..8e7bbfab1b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
@@ -9,11 +9,12 @@
 <div id="changelanguage" class="ft">
 [% IF ( languages_loop && opaclanguagesdisplay ) %]
     [% UNLESS ( one_language_enabled ) %]
-        <strong>Languages: </strong>
+        <div class="lang"><strong>Languages: </strong></div>
         [% FOREACH languages_loo IN languages_loop %]
+	    <div class="lang">
             [% IF ( languages_loo.group_enabled ) %]
             [% IF ( languages_loo.plural ) %]
-            <a id="show[% languages_loo.rfc4646_subtag %]" class="sublangs more" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a>
+            <a id="show[% languages_loo.rfc4646_subtag %]" class="sublangs more" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a>[% UNLESS ( loop.last ) %] | [% END %]
 			<div id="sub[% languages_loo.rfc4646_subtag %]">
             <div class="bd"><ul>
             [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
@@ -37,7 +38,8 @@
                 [% END %]
 		[% END %]
             [% END %]
-            [% END %][% UNLESS ( loop.last ) %] | [% END %]
+            [% END %][% UNLESS ( loop.last || languages_loo.plural ) %] | [% END %]
+            </div>
         [% END %]
     [% END %]
 [% END %]
-- 
2.39.5