[Koha-patches] [PATCH] Bug 7644 - Invalid markup in staff client language chooser
Owen Leonard
oleonard at myacpl.org
Tue Mar 6 16:06:07 CET 2012
This patch removes invalid markup from the language chooser
in the intranet. It also copies the markup and style of
the staff client include to the OPAC so the two are
more consistent. I hope that will make future changes
and debugging a little easier.
I believe this patch also fixes Bug 7366, "Language chooser
display problems."
---
.../intranet-tmpl/prog/en/css/staff-global.css | 9 ++-
.../prog/en/includes/intranet-bottom.inc | 4 +-
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 61 ++++++++++++++-----
.../opac-tmpl/prog/en/includes/opac-bottom.inc | 64 ++++++++++----------
4 files changed, 87 insertions(+), 51 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index fec66d6..2ffbc4a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1738,10 +1738,15 @@ ul#i18nMenu {
ul#i18nMenu li {
border-left : 1px solid #CCC;
display : inline;
+ float: left;
list-style : none;
padding : 0 10px;
- }
-
+}
+
+ul#i18nMenu li.yuimenuitem {
+ float: none;
+}
+
ul#i18nMenu li:first-child {
border-left : 0;
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index ebe7f37..7dd5d17 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -5,7 +5,7 @@
<div id="changelanguage" class="ft">
<ul id="i18nMenu" class="footermenu">
[% FOREACH languages_loo IN languages_loop %]
- <div class="lang">
+
[% IF ( languages_loo.group_enabled ) %]
[% IF ( languages_loo.plural ) %]
<li class="more"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% languages_loo.native_description %] ([% languages_loo.rfc4646_subtag %])</a><div id="sub[% languages_loo.rfc4646_subtag %]">
@@ -32,7 +32,7 @@
[% END %]
[% END %]
[% END %]
- </div>
+
[% END %]
</ul>
</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index f2b1467..70db2f9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1476,29 +1476,58 @@ div#changelanguage{
div#changelanguage a {
font-weight : normal;
- padding : .5em;
-}
-
-div#changelanguage a.more {
- background-image:url(../../images/more-up-arrow.gif);
- background-position:right center;
- background-repeat:no-repeat;
- padding-right:13px;
+ padding : .5em 0;
}
-
+
div#changelanguage li.yuimenuitem {
- font-size : 120%;
- font-weight : normal;
- margin : 0;
- padding : 0 1em;
+ font-size: 120%;
+ font-weight: normal;
+ margin: 0;
+ padding: 0 1em;
}
-
div#changelanguage li.yuimenuitem a.yuimenuitemlabel {
+ padding: 0;
+}
+
+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/more-up-arrow.gif);
+ background-position:right center;
+ background-repeat:no-repeat;
+ padding-right: 1.3em;
+}
+
+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;
}
#cartDetails,#cartUpdate,#holdDetails,#listsDetails {
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 a264af3..46e195d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
@@ -6,43 +6,46 @@
</div>
[% IF ( opaclanguagesdisplay || OpacKohaUrl ) %]
-<div id="changelanguage" class="ft">
-[% IF ( languages_loop && opaclanguagesdisplay ) %]
- [% UNLESS ( one_language_enabled ) %]
- <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>[% UNLESS ( loop.last ) %] | [% END %]
- <div id="sub[% languages_loo.rfc4646_subtag %]">
- <div class="bd"><ul>
- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
- [% IF ( sublanguages_loo.enabled ) %]
- [% IF ( sublanguages_loo.sublanguage_current ) %]
- <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li>
- [% ELSE %]
- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
- [% END %]
- [% END %]
+ [% IF ( languages_loop && opaclanguagesdisplay ) %]
+ [% UNLESS ( one_language_enabled ) %]
+ <div id="changelanguage" class="ft">
+ <div class="lang" style="float:left;padding: 0.1em 0;"><strong>Languages: </strong></div>
+ <ul id="i18nMenu" class="footermenu">
+ [% FOREACH languages_loo IN languages_loop %]
+
+ [% IF ( languages_loo.group_enabled ) %]
+ [% IF ( languages_loo.plural ) %]
+ <li class="more" style="float:left;"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a><div id="sub[% languages_loo.rfc4646_subtag %]">
+ <div class="bd"><ul>
+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
+ [% IF ( sublanguages_loo.enabled ) %]
+ [% IF ( sublanguages_loo.sublanguage_current ) %]
+ <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li>
+ [% ELSE %]
+ <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
[% END %]
- </ul>
- </div>
- </div>
- [% ELSE %]
- [% IF ( languages_loo.group_enabled ) %]
- [% IF ( languages_loo.current ) %]
- [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
+ [% END %]
+
+ [% END %]
+ </ul></div></div></li>
+
[% ELSE %]
- <a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a>
+ [% IF ( languages_loo.group_enabled ) %]
+ [% IF ( languages_loo.current ) %]
+ <li style="float:left;">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</li>
+ [% ELSE %]
+ <li style="float:left;"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
+ [% END %]
+ [% END %]
+ [% END %]
[% END %]
- [% END %]
+
[% END %]
- [% END %][% UNLESS ( loop.last || languages_loo.plural ) %] | [% END %]
+ </ul>
</div>
[% END %]
[% END %]
-[% END %]
+
[% IF ( OpacKohaUrl ) %]
<span class="koha_url">
@@ -50,7 +53,6 @@
</span>
[% END %]
-</div>
[% END %]
[% IF ( Babeltheque ) %]
--
1.7.3
More information about the Koha-patches
mailing list