Owen Leonard
6b6e0b43c2
There is currently no visual feedback to the user reflecting which of multiple installed translations is currently selected. I think some necessary styling didn't make it into the conversion to Bootstrap menus. This patch attempts to improve things. Most of the changes are to bring back the previous style of highlighting the currently selected language. A new change is the addition of the sub-language code to the display of the menu label if one of that menu item's sub-languages is selected. This patch also removes some obsolete CSS which referred to the old menu system. To test, apply the patch and install or update multiple languages, including at least two sub-languages. In my test I used en, en-GB and de-DE. Clear your browser cache if necessary. Enable all these languages and test the functionality of the language selection menu in the footer. - Non-enabled languages should appear as non-bold links. - When a single language (with no sub-languages) is enabled it should appear as bold text. - When one of multiple sub-languages is enabled that selection in the pop-up menu should appear as bold text. The menu label should show in bold the language code of the selected sub-language. Tested with de-DE and de-CH, works as expected Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works as expected, passes all tests. No problems found. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
69 lines
3.4 KiB
HTML
69 lines
3.4 KiB
HTML
</div>
|
|
|
|
[% IF ( languages_loop ) %]
|
|
[% UNLESS ( one_language_enabled ) %]
|
|
<div id="changelanguage" class="navbar navbar-fixed-bottom">
|
|
<div class="navbar-inner">
|
|
<ul id="i18nMenu" class="nav">
|
|
[% FOREACH languages_loo IN languages_loop %]
|
|
|
|
[% IF ( languages_loo.group_enabled ) %]
|
|
[% IF ( languages_loo.plural ) %]
|
|
<li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">
|
|
[% IF ( languages_loo.native_description ) %]
|
|
[% languages_loo.native_description %]
|
|
[% ELSE %]
|
|
[% languages_loo.rfc4646_subtag %]
|
|
[% END %]
|
|
[% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
|
|
[% IF ( sublanguages_loo.enabled ) %]
|
|
[% IF ( sublanguages_loo.sublanguage_current ) %]
|
|
<span class="sublanguage-selected">([% sublanguages_loo.rfc4646_subtag %])</span>
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
<span class="caret"></span></a>
|
|
<ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
|
|
[% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
|
|
[% IF ( sublanguages_loo.enabled ) %]
|
|
[% IF ( sublanguages_loo.sublanguage_current ) %]
|
|
<li class="navbar-text"> <a href="#" class="currentlanguage disabled">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></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 %]
|
|
[% END %]
|
|
|
|
[% END %]
|
|
</ul></li>
|
|
|
|
[% ELSE %]
|
|
[% IF ( languages_loo.group_enabled ) %]
|
|
[% IF ( languages_loo.current ) %]
|
|
<li class="navbar-text">
|
|
[% IF ( languages_loo.native_description ) %]
|
|
<span class="currentlanguage">[% languages_loo.native_description %]</span>
|
|
[% ELSE %]
|
|
<span class="currentlanguage">[% languages_loo.rfc4646_subtag %]</span>
|
|
[% END %]
|
|
</li>
|
|
[% ELSE %]
|
|
<li><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 %]
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
[% END %]
|
|
</body>
|
|
</html>
|