View | Details | Raw Unified | Return to bug 12017
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-30 / +9 lines)
Lines 5-36 Link Here
5
        <div id="changelanguage" class="navbar navbar-fixed-bottom">
5
        <div id="changelanguage" class="navbar navbar-fixed-bottom">
6
            <div class="navbar-inner">
6
            <div class="navbar-inner">
7
        <ul id="i18nMenu" class="nav">
7
        <ul id="i18nMenu" class="nav">
8
        [% FOREACH languages_loo IN languages_loop %]
8
        [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
9
9
10
            [% IF ( languages_loo.group_enabled ) %]
10
            [% IF ( languages_loo.group_enabled ) %]
11
            [% IF ( languages_loo.plural ) %]
11
            [% IF ( languages_loo.plural ) %]
12
                <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">
12
            <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]<span class="caret"></span></a>
13
                    [% IF ( languages_loo.native_description ) %]
14
                        [% languages_loo.native_description %]
15
                    [% ELSE %]
16
                        [% languages_loo.rfc4646_subtag %]
17
                    [% END %]
18
                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
19
                        [% IF ( sublanguages_loo.enabled ) %]
20
                            [% IF ( sublanguages_loo.sublanguage_current ) %]
21
                                <span class="sublanguage-selected">([% sublanguages_loo.rfc4646_subtag %])</span>
22
                            [% END %]
23
                        [% END %]
24
                    [% END %]
25
                <span class="caret"></span></a>
26
            <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
13
            <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
27
            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
14
            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %]
28
        [% IF ( sublanguages_loo.enabled ) %]
15
                [% IF ( sublanguages_loo.enabled ) %]
29
                [% IF ( sublanguages_loo.sublanguage_current ) %]
16
                [% IF ( sublanguages_loo.sublanguage_current ) %]
30
                    <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>
17
                    <li> <a href="#">[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
31
                [% ELSE %]
18
                [% ELSE %]
32
                <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>
19
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]">[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
33
        [% END %]
20
                [% END %]
34
                [% END %]
21
                [% END %]
35
22
36
            [% END %]
23
            [% END %]
Lines 40-58 Link Here
40
            [% IF ( languages_loo.group_enabled ) %]
27
            [% IF ( languages_loo.group_enabled ) %]
41
                [% IF ( languages_loo.current ) %]
28
                [% IF ( languages_loo.current ) %]
42
                    <li class="navbar-text">
29
                    <li class="navbar-text">
43
                        [% IF ( languages_loo.native_description ) %]
30
                        [% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]
44
                            <span class="currentlanguage">[% languages_loo.native_description %]</span>
45
                        [% ELSE %]
46
                            <span class="currentlanguage">[% languages_loo.rfc4646_subtag %]</span>
47
                        [% END %]
48
                    </li>
31
                    </li>
49
                [% ELSE %]
32
                [% ELSE %]
50
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">
33
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">
51
                        [% IF ( languages_loo.native_description ) %]
34
                        [% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]
52
                            [% languages_loo.native_description %]
53
                        [% ELSE %]
54
                            [% languages_loo.rfc4646_subtag %]
55
                        [% END %]
56
                    </a></li>
35
                    </a></li>
57
                [% END %]
36
                [% END %]
58
        [% END %]
37
        [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-8 / +7 lines)
Lines 37-54 Link Here
37
                    <div class="navbar-inner">
37
                    <div class="navbar-inner">
38
                        <ul id="i18nMenu" class="nav">
38
                        <ul id="i18nMenu" class="nav">
39
                            <li><p class="lang navbar-text"><strong>Languages:&nbsp;</strong></p></li>
39
                            <li><p class="lang navbar-text"><strong>Languages:&nbsp;</strong></p></li>
40
                            [% FOREACH languages_loo IN languages_loop %]
40
                            [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
41
                                [% IF ( languages_loo.group_enabled ) %]
41
                                [% IF ( languages_loo.group_enabled ) %]
42
                                    [% IF ( languages_loo.plural ) %]
42
                                    [% IF ( languages_loo.plural ) %]
43
                                        <li class="dropdown">
43
                                        <li class="dropdown">
44
                                            <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] <b class="caret"></b></a>
44
                                             <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]<b class="caret"></b></a>
45
                                                <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
45
                                                <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
46
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
46
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %]
47
                                                        [% IF ( sublanguages_loo.enabled ) %]
47
                                                        [% IF ( sublanguages_loo.enabled ) %]
48
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
48
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
49
                                                                <li> <p>[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</p></li>
49
                                                                <li> <p>[% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</p></li>
50
                                                            [% ELSE %]
50
                                                            [% ELSE %]
51
                                                                <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>
51
                                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
52
                                                            [% END %]
52
                                                            [% END %]
53
                                                        [% END # / IF sublanguages_loo.enabled %]
53
                                                        [% END # / IF sublanguages_loo.enabled %]
54
                                                    [% END # / FOREACH sublanguages_loo %]
54
                                                    [% END # / FOREACH sublanguages_loo %]
Lines 57-65 Link Here
57
                                    [% ELSE %]
57
                                    [% ELSE %]
58
                                        [% IF ( languages_loo.group_enabled ) %]
58
                                        [% IF ( languages_loo.group_enabled ) %]
59
                                            [% IF ( languages_loo.current ) %]
59
                                            [% IF ( languages_loo.current ) %]
60
                                                <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</p></li>
60
                                                <li class="active"><p class="navbar-text">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]</p></li>
61
                                            [% ELSE %]
61
                                            [% ELSE %]
62
                                                <li><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></li>
62
                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]</a></li>
63
                                            [% END %]
63
                                            [% END %]
64
                                        [% END # / IF languages_loo.current %]
64
                                        [% END # / IF languages_loo.current %]
65
                                    [% END # / IF ( languages_loo.plural ) %]
65
                                    [% END # / IF ( languages_loo.plural ) %]
66
- 

Return to bug 12017